Merge branch '9-1-stable' into 9-1-stable-ee

* 9-1-stable: Merge branch 'revert-a0d734c9' into 'master'

Merge branch '9-1-stable' into 9-1-stable-ee
720fe1e3 · Lin Jen-Shin · 7d7d5ce1 · 5fac288c · 720fe1e3
Commit 720fe1e3 authored 7 years ago by Lin Jen-Shin
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -363,7 +363,7 @@ GEM
    grape-entity (0.6.0)
      activesupport
      multi_json (>= 1.3.2)
-    grpc (1.2.2)
+    grpc (1.1.2)
      google-protobuf (~> 3.1)
      googleauth (~> 0.5.1)
    gssapi (1.2.0)