Merge pull request #8296 from gyuho/grpc

vendor: upgrade grpc/grpc-go to v1.5.1
etcd-io · Jul 27, 2017 · 8365233 · 8365233
2 parents 2a348fb + 9fee4b7
commit 8365233
Show file tree

Hide file tree

Showing 49 changed files with 1,590 additions and 1,169 deletions.
diff --git a/bill-of-materials.json b/bill-of-materials.json
@@ -358,8 +358,8 @@
 		"project": "google.golang.org/grpc",
 		"licenses": [
 			{
-				"type": "BSD 3-clause \"New\" or \"Revised\" License",
-				"confidence": 0.979253112033195
+				"type": "Apache License 2.0",
+				"confidence": 1
 			}
 		]
 	},

diff --git a/cmd/vendor/google.golang.org/grpc/LICENSE b/cmd/vendor/google.golang.org/grpc/LICENSE
diff --git a/cmd/vendor/google.golang.org/grpc/PATENTS b/cmd/vendor/google.golang.org/grpc/PATENTS
diff --git a/cmd/vendor/google.golang.org/grpc/backoff.go b/cmd/vendor/google.golang.org/grpc/backoff.go
diff --git a/cmd/vendor/google.golang.org/grpc/balancer.go b/cmd/vendor/google.golang.org/grpc/balancer.go