Vendor GRPC 1.12.0, protobuf 1.1.0, and gogo protobuf 1.0.0.

Signed-off-by: Ying Li <ying.li@docker.com>
moby · May 25, 2018 · 519330a · 519330a
1 parent 850b320
commit 519330a
Show file tree

Hide file tree

Showing 106 changed files with 15,797 additions and 7,034 deletions.
diff --git a/vendor.conf b/vendor.conf
@@ -1,14 +1,16 @@
 # grpc and protobuf
 #
-# NOTE(dperny): there is some error handling, found in the
+# NOTE(dperny,cyli): there is some error handling, found in the
 # (*firstSessionErrorTracker).SessionClosed method in node/node.go, which
 # relies on string matching to handle x509 errors. between grpc versions 1.3.0
 # and 1.7.5, the error string we were matching changed, breaking swarmkit.
-# after updating GRPC, if integration test failures occur, verify that the
+# In 1.10.x, GRPC stopped surfacing those errors entirely, breaking swarmkit.
+# In >=1.11, those errors were brought back but the string had changed again.
+# After updating GRPC, if integration test failures occur, verify that the
 # string matching there is correct.
-google.golang.org/grpc v1.7.5
-github.com/gogo/protobuf v0.5
-github.com/golang/protobuf 1e59b77b52bf8e4b449a57e6f79f21226d571845
+google.golang.org/grpc v1.12.0
+github.com/gogo/protobuf v1.0.0
+github.com/golang/protobuf v1.1.0
 github.com/matttproud/golang_protobuf_extensions v1.0.0
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
 

diff --git a/vendor/github.com/gogo/protobuf/README b/vendor/github.com/gogo/protobuf/README
diff --git a/vendor/github.com/gogo/protobuf/Readme.md b/vendor/github.com/gogo/protobuf/Readme.md
diff --git a/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go b/vendor/github.com/gogo/protobuf/gogoproto/gogo.pb.go
diff --git a/vendor/github.com/gogo/protobuf/gogoproto/gogo.proto b/vendor/github.com/gogo/protobuf/gogoproto/gogo.proto