Merge "[FAB-6094] Insert default Kafka version in config"

hyperledger · Sep 13, 2017 · 6dc00d7 · 6dc00d7
2 parents 368b92a + c3124a0
commit 6dc00d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/examples/cluster/config/orderer.yaml b/examples/cluster/config/orderer.yaml
@@ -223,4 +223,4 @@ Kafka:
         #File: path/to/RootCAs
 
     # Kafka version of the Kafka cluster brokers (defaults to 0.10.2.0)
-    Version:
+    Version: 0.10.2.0
diff --git a/orderer/common/localconfig/config.go b/orderer/common/localconfig/config.go
@@ -220,7 +220,7 @@ var defaults = TopLevel{
 			},
 		},
 		Verbose: false,
-		Version: sarama.V0_10_1_0,
+		Version: sarama.V0_10_2_0,
 		TLS: TLS{
 			Enabled: false,
 		},

diff --git a/sampleconfig/orderer.yaml b/sampleconfig/orderer.yaml
@@ -225,8 +225,7 @@ Kafka:
         # value of RootCAs.
         #File: path/to/RootCAs
     # Kafka version of the Kafka cluster brokers (defaults to 0.10.2.0)
-    Version:
-        #
+    Version: 0.10.2.0
 
 ################################################################################
 #