Merge branch 'grpc-1.2.2' into 'master'

Use gRPC 1.2.2 Closes #30766 See merge request !10589

Merge branch 'grpc-1.2.2' into 'master'
f99a8f66 · Sean McGivern · Lin Jen-Shin · e683b8d1 · f99a8f66
Commit f99a8f66 authored Apr 12, 2017 by Sean McGivern Committed by Lin Jen-Shin Apr 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -330,7 +330,7 @@ GEM
    grape-entity (0.6.0)
      activesupport
      multi_json (>= 1.3.2)
-    grpc (1.1.2)
+    grpc (1.2.2)
      google-protobuf (~> 3.1)
      googleauth (~> 0.5.1)
    haml (4.0.7)