Merge branch 'release/0.6.3'

citusdata · Jul 11, 2017 · b94e9e7 · b94e9e7
2 parents 05740a8 + 57e6ffa
commit b94e9e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### citustools v0.6.3 (July 11, 2017) ###
+
+* Addresses citus-style compatibility issues with uncrustify 0.65
+
 ### citustools v0.6.2 (June 19, 2017) ###
 
 * Fixes bug causing early exit during first release of new package

diff --git a/uncrustify/citus-style.cfg b/uncrustify/citus-style.cfg
@@ -1392,7 +1392,7 @@ nl_before_cpp_comment                     = 0        # number
 nl_after_multiline_comment                = false    # false/true
 
 # The number of newlines after '}' or ';' of a struct/enum/union definition
-nl_after_struct                           = 3        # number
+nl_after_struct                           = 1        # number
 
 # The number of newlines after '}' or ';' of a class definition
 nl_after_class                            = 0        # number
@@ -1522,7 +1522,7 @@ mod_sort_using                            = false    # false/true
 mod_sort_include                          = false    # false/true
 
 # If TRUE, it will move a 'break' that appears after a fully braced 'case' before the close brace.
-mod_move_case_break                       = false    # false/true
+mod_move_case_break                       = true    # false/true
 
 # Will add or remove the braces around a fully braced case statement.
 # Will only remove the braces if there are no variable declarations in the block.