Merge branch 'grpc-1.2.5' into 'master'

Use grpc 1.2.5 Closes #31143 and gitaly#197 See merge request !10984

Merge branch 'grpc-1.2.5' into 'master'
bb3870ea · Robert Speicher · 1f47b570 · d72405b0 · bb3870ea
Commit bb3870ea authored Apr 28, 2017 by Robert Speicher
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.5)
      google-protobuf (~> 3.1)
      googleauth (~> 0.5.1)
    haml (4.0.7)