Merge "Update sarama library" into release-1.2

hyperledger · Nov 15, 2018 · 14098ec · 14098ec
2 parents c613a45 + 9447afd
commit 14098ec
Show file tree

Hide file tree

Showing 49 changed files with 3,332 additions and 621 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -17,7 +17,7 @@ ignored = [
 
 [[constraint]]
   name = "github.com/Shopify/sarama"
-  version = "1.16.0"
+  version = "1.19.0"
 
 [[constraint]]
   name = "github.com/cactus/go-statsd-client"

diff --git a/orderer/consensus/kafka/chain_test.go b/orderer/consensus/kafka/chain_test.go
@@ -576,7 +576,7 @@ func TestCloseKafkaObjects(t *testing.T) {
 
 		assert.Len(t, errs, 0, "Expected zero errors")
 
-		assert.Panics(t, func() {
+		assert.NotPanics(t, func() {
 			channelConsumer.Close()
 		})
 

diff --git a/vendor/github.com/Shopify/sarama/LICENSE b/vendor/github.com/Shopify/sarama/LICENSE