Merge pull request #2186 from aaronlehmann/gogoproto

gogoproto compatibility fix
moby · May 16, 2017 · 998a47f · 998a47f
2 parents feb448e + ca59883
commit 998a47f
Show file tree

Hide file tree

Showing 49 changed files with 2,010 additions and 1,083 deletions.
diff --git a/api/control.pb.go b/api/control.pb.go
diff --git a/api/control.proto b/api/control.proto
@@ -176,8 +176,8 @@ message ListNodesRequest {
 		repeated string names = 1;
 		repeated string id_prefixes = 2;
 		map<string, string> labels = 3;
-		repeated NodeSpec.Membership memberships = 4;
-		repeated NodeRole roles = 5;
+		repeated NodeSpec.Membership memberships = 4 [packed=false];
+		repeated NodeRole roles = 5 [packed=false];
 		// NamePrefixes matches all objects with the given prefixes
 		repeated string name_prefixes = 6;
 	}
@@ -233,7 +233,7 @@ message ListTasksRequest {
 		map<string, string> labels = 3;
 		repeated string service_ids = 4;
 		repeated string node_ids = 5;
-		repeated docker.swarmkit.v1.TaskState desired_states = 6;
+		repeated docker.swarmkit.v1.TaskState desired_states = 6 [packed=false];
 		// NamePrefixes matches all objects with the given prefixes
 		repeated string name_prefixes = 7;
 		repeated string runtimes = 9;

diff --git a/api/dispatcher.pb.go b/api/dispatcher.pb.go
diff --git a/api/logbroker.pb.go b/api/logbroker.pb.go
diff --git a/api/logbroker.proto b/api/logbroker.proto
@@ -19,7 +19,7 @@ enum LogStream {
 message LogSubscriptionOptions {
 	// Streams defines which log streams should be sent from the task source.
 	// Empty means send all the messages.
-	repeated LogStream streams = 1;
+	repeated LogStream streams = 1 [packed=false];
 
 	// Follow instructs the publisher to continue sending log messages as they
 	// are produced, after satisfying the initial query.

diff --git a/api/raft.pb.go b/api/raft.pb.go
diff --git a/api/raft.proto b/api/raft.proto
@@ -66,7 +66,7 @@ message JoinResponse {
 
 	// RemovedMembers is a list of members that have been removed from
 	// the cluster, so the new node can avoid communicating with them.
-	repeated uint64 removed_members = 3;
+	repeated uint64 removed_members = 3 [packed=false];
 }
 
 message LeaveRequest {

diff --git a/api/snapshot.pb.go b/api/snapshot.pb.go
diff --git a/api/snapshot.proto b/api/snapshot.proto
@@ -28,7 +28,7 @@ message StoreSnapshot {
 // ClusterSnapshot stores cluster membership information in snapshots.
 message ClusterSnapshot {
 	repeated RaftMember members = 1;
-	repeated uint64 removed = 2;
+	repeated uint64 removed = 2 [packed=false];
 }
 
 message Snapshot {

diff --git a/api/types.pb.go b/api/types.pb.go
diff --git a/protobuf/plugin/plugin.pb.go b/protobuf/plugin/plugin.pb.go
diff --git a/vendor.conf b/vendor.conf
@@ -1,6 +1,6 @@
 # grpc and protobuf
 google.golang.org/grpc v1.0.4
-github.com/gogo/protobuf 8d70fb3182befc465c4a1eac8ad4d38ff49778e2
+github.com/gogo/protobuf v0.4
 github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
 github.com/matttproud/golang_protobuf_extensions v1.0.0
 

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/doc.go b/vendor/github.com/gogo/protobuf/gogoproto/doc.go