Merge ca294cb into 505421d

lightningnetwork · Mar 27, 2017 · 3d6c97c · 3d6c97c
2 parents 505421d + ca294cb
commit 3d6c97c
Show file tree

Hide file tree

Showing 4 changed files with 258 additions and 249 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -61,3 +61,6 @@ import:
 - package: github.com/tv42/zbase32
 - package: github.com/awalterschulze/gographviz
   version: ^1.0.0
+- package: google.golang.org/genproto
+  subpackages:
+  - googleapis/api/annotation
diff --git a/lnrpc/gen_protos.sh b/lnrpc/gen_protos.sh
@@ -4,7 +4,7 @@
 protoc -I/usr/local/include -I. \
        -I$GOPATH/src \
        -I$GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
-       --go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. \
+       --go_out=plugins=grpc:. \
        rpc.proto