You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by ro...@apache.org on 2015/01/12 19:26:02 UTC
[1/3] incubator-usergrid git commit: Added comments to configuration
options. removed 'root' declaration
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 8b338b184 -> e090acfeb
Added comments to configuration options. removed 'root' declaration
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f153cda7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f153cda7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f153cda7
Branch: refs/heads/two-dot-o
Commit: f153cda7cd820dcc57127d8a65f53389bb5dfde0
Parents: 8dc4405
Author: ryan bridges <rb...@apigee.com>
Authored: Fri Dec 5 10:08:26 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Wed Jan 7 13:14:26 2015 -0500
----------------------------------------------------------------------
stack/.editorconfig | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/f153cda7/stack/.editorconfig
----------------------------------------------------------------------
diff --git a/stack/.editorconfig b/stack/.editorconfig
index 21ba8b8..cc4e3a0 100644
--- a/stack/.editorconfig
+++ b/stack/.editorconfig
@@ -1,19 +1,26 @@
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
[*]
+# Unix-style newlines with a newline ending every file
end_of_line = lf
+# New line at the end of every file
insert_final_newline = true
+# set default character set to utf-8
charset = utf-8
+# Trim trailing whitespace from the end of lines
trim_trailing_whitespace = true
+# Use spaces instead of tabs
indent_style = space
+# Indent new lines with 4 spaces
indent_size = 4
+# Lines that are a continuation of the previous line get an extra 4 spaces
continuation_indent_size = 4
-max_line_length = 80
+# Set the maximum line length to 120
+max_line_length = 120
# java
[*.java]
+# Do not move curly braces to the next line
curly_bracket_next_line = false
+# Add a space before and after brackets "[],{},()"
spaces_around_brackets = both
+# Add a space on either side of an operator
spaces_around_operators = true
[2/3] incubator-usergrid git commit: Adding editorconfig settings
file to help with consistent formatting
Posted by ro...@apache.org.
Adding editorconfig settings file to help with consistent formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/8dc44051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/8dc44051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/8dc44051
Branch: refs/heads/two-dot-o
Commit: 8dc44051b3da0c8c84403b2e132f2c4f483f85b3
Parents: fe7719a
Author: ryan bridges <rb...@apigee.com>
Authored: Fri Dec 5 09:49:09 2014 -0500
Committer: ryan bridges <rb...@apigee.com>
Committed: Wed Jan 7 13:14:26 2015 -0500
----------------------------------------------------------------------
stack/.editorconfig | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/8dc44051/stack/.editorconfig
----------------------------------------------------------------------
diff --git a/stack/.editorconfig b/stack/.editorconfig
new file mode 100644
index 0000000..21ba8b8
--- /dev/null
+++ b/stack/.editorconfig
@@ -0,0 +1,19 @@
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+continuation_indent_size = 4
+max_line_length = 80
+
+# java
+[*.java]
+curly_bracket_next_line = false
+spaces_around_brackets = both
+spaces_around_operators = true
[3/3] incubator-usergrid git commit: Merge remote-tracking branch
'r3b/editorconfig' into apache_usergrid/two-dot-o
Posted by ro...@apache.org.
Merge remote-tracking branch 'r3b/editorconfig' into apache_usergrid/two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e090acfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e090acfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e090acfe
Branch: refs/heads/two-dot-o
Commit: e090acfeb8562144a3125bdd7092d805e8980564
Parents: 8b338b1 f153cda
Author: Rod Simpson <ro...@apigee.com>
Authored: Mon Jan 12 11:25:51 2015 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Mon Jan 12 11:25:51 2015 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------