Merge branch 'grpc-1.4' into 'master'

Use grpc 1.4.0 Closes omnibus-gitlab#2414 See merge request !12387

Merge branch 'grpc-1.4' into 'master'
Use grpc 1.4.0 Closes omnibus-gitlab#2414 See merge request !12387
36cd2baa · Sean McGivern · 55f4869a · e7afde0c · 36cd2baa
Commit 36cd2baa authored Jun 26, 2017 by Sean McGivern
Show 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
@@ -352,7 +352,7 @@ GEM
    grape-entity (0.6.0)
      activesupport
      multi_json (>= 1.3.2)
-    grpc (1.2.5)
+    grpc (1.4.0)
      google-protobuf (~> 3.1)
      googleauth (~> 0.5.1)
    haml (4.0.7)