From ac2c670de0fd28df354d75f959e6f03f540e53e0 Mon Sep 17 00:00:00 2001
From: Robert Speicher <robert@gitlab.com>
Date: Tue, 21 Nov 2017 00:11:06 +0000
Subject: Merge branch 'grpc-update' into 'master'

Update gRPC to v1.7.2

Closes gitaly#742

See merge request gitlab-org/gitlab-ce!15439

(cherry picked from commit 9a8f094e34e9f6da5932f239a510abcd996a79b3)

473ae04d Update gRPC to v1.7.2
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ae145ca5f69..36e85f8744a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,10 +354,10 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
-    grpc (1.6.6)
+    grpc (1.7.2)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
-      googleauth (~> 0.5.1)
+      googleauth (>= 0.5.1, < 0.7)
     haml (4.0.7)
       tilt
     haml_lint (0.26.0)
-- 
cgit v1.2.1