Merge "[FAB-4024] Update vendor for Fabric flogging"

hyperledger · May 24, 2017 · 4fa7ec0 · 4fa7ec0
2 parents f450a59 + 804eb19
commit 4fa7ec0
Show file tree

Hide file tree

Showing 6 changed files with 211 additions and 8 deletions.
diff --git a/vendor/github.com/hyperledger/fabric/common/flogging/grpclogger.go b/vendor/github.com/hyperledger/fabric/common/flogging/grpclogger.go
diff --git a/vendor/github.com/hyperledger/fabric/common/flogging/logging.go b/vendor/github.com/hyperledger/fabric/common/flogging/logging.go
diff --git a/vendor/google.golang.org/grpc/LICENSE b/vendor/google.golang.org/grpc/LICENSE
diff --git a/vendor/google.golang.org/grpc/PATENTS b/vendor/google.golang.org/grpc/PATENTS
diff --git a/vendor/google.golang.org/grpc/grpclog/logger.go b/vendor/google.golang.org/grpc/grpclog/logger.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -484,10 +484,10 @@
 			"revisionTime": "2017-05-12T16:44:56Z"
 		},
 		{
-			"checksumSHA1": "JcHPNgBRH9H+EP+GoeV18GZGd5g=",
+			"checksumSHA1": "bJGbjvNRGfR/S4yRVfmJITzkxoI=",
 			"path": "github.com/hyperledger/fabric/common/flogging",
-			"revision": "935f608608903bfc171c7d631aedbb70156d62c0",
-			"revisionTime": "2017-04-24T13:40:27Z"
+			"revision": "6b6bfcfbd1e798a8a08fa9c3bf4dc0ff766a6b87",
+			"revisionTime": "2017-05-12T16:44:56Z"
 		},
 		{
 			"checksumSHA1": "40vJyUB4ezQSn/NSadsKEOrudMc=",
@@ -796,6 +796,12 @@
 			"revision": "a8b38433e35b65ba247bb267317037dee1b70cea",
 			"revisionTime": "2016-10-19T13:35:53Z"
 		},
+		{
+			"checksumSHA1": "o3e5IH3OMSjhdJX/juumCbZ0hfM=",
+			"path": "google.golang.org/grpc/grpclog",
+			"revision": "1f1a4999ca75ba4fd6d5c91233383a170034a1a5",
+			"revisionTime": "2015-10-22T21:00:00Z"
+		},
 		{
 			"checksumSHA1": "wSu8owMAP7GixsYoSZ4CmKUVhnU=",
 			"path": "gopkg.in/asn1-ber.v1",