Merge branch 'grpc-update' into 'master'

Update gRPC to v1.7.2

Closes gitaly#742

See merge request gitlab-org/gitlab-ce!15439
This commit is contained in:
Robert Speicher 2017-11-21 00:11:06 +00:00
commit 9a8f094e34
1 changed files with 2 additions and 2 deletions

View File

@ -355,10 +355,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)