Merge "[FAB-1468] Fix make protos and regen proto files"

hyperledger · Jan 10, 2017 · 4896a04 · 4896a04
2 parents 3d0865c + ab7e34f
commit 4896a04
Show file tree

Hide file tree

Showing 12 changed files with 284 additions and 526 deletions.
diff --git a/core/comm/testdata/grpc/test.pb.go b/core/comm/testdata/grpc/test.pb.go
diff --git a/core/comm/testdata/grpc/test.proto b/core/comm/testdata/grpc/test.proto
@@ -16,10 +16,12 @@ limitations under the License.
 
 syntax = "proto3";
 
+option go_package = "github.com/hyperledger/fabric/core/comm/testdata/grpc";
+
 message Empty {}
 
 service TestService {
 
   rpc EmptyCall(Empty) returns (Empty);
 
-}
+}
diff --git a/protos/common/chain-config.pb.go b/protos/common/chain-config.pb.go