Repository: trafficserver
Updated Branches:
  refs/heads/master 7db84e514 -> ae1b7297b


Updated with a few changes, thanks bcall and psudaemon for the input


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ae1b7297
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ae1b7297
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ae1b7297

Branch: refs/heads/master
Commit: ae1b7297b026b5b368c7c8d0721561d2ce3a2bb8
Parents: 7db84e5
Author: Leif Hedstrom <[email protected]>
Authored: Fri Feb 27 19:35:54 2015 -0500
Committer: Leif Hedstrom <[email protected]>
Committed: Fri Feb 27 19:35:54 2015 -0500

----------------------------------------------------------------------
 .clang-format | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ae1b7297/.clang-format
----------------------------------------------------------------------
diff --git a/.clang-format b/.clang-format
index f145c39..0342ce2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -15,11 +15,11 @@ AlwaysBreakAfterDefinitionReturnType: true
 AlwaysBreakTemplateDeclarations: false
 AlwaysBreakBeforeMultilineStrings: false
 BreakBeforeBinaryOperators: None
-BreakBeforeTernaryOperators: true
+BreakBeforeTernaryOperators: false
 BreakConstructorInitializersBeforeComma: false
 BinPackParameters: true
 BinPackArguments: true
-ColumnLimit:     120
+ColumnLimit:     132
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: false
@@ -28,7 +28,7 @@ IndentWrappedFunctionNames: false
 IndentFunctionDeclarationAfterType: false
 MaxEmptyLinesToKeep: 2
 KeepEmptyLinesAtTheStartOfBlocks: false
-NamespaceIndentation: None
+NamespaceIndentation: Inner
 ObjCSpaceAfterProperty: true
 ObjCSpaceBeforeProtocolList: false
 PenaltyBreakBeforeFirstCallParameter: 19

Reply via email to