Merge branch 'grpc-1.6' into 'master'

Use grpc 1.6.0 See merge request gitlab-org/gitlab-ce!14262

Merge branch 'grpc-1.6' into 'master'
Use grpc 1.6.0 See merge request gitlab-org/gitlab-ce!14262
3dd22486 · Robert Speicher · cff8d9ac · ae63e929 · 3dd22486
Commit 3dd22486 authored Sep 15, 2017 by Robert Speicher
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
@@ -357,7 +357,7 @@ GEM
      rake
    grape_logging (1.7.0)
      grape
-    grpc (1.4.5)
+    grpc (1.6.0)
      google-protobuf (~> 3.1)
      googleauth (~> 0.5.1)
    haml (4.0.7)