From 5379e8219d31772125d21a4b17cfc21fece402c9 Mon Sep 17 00:00:00 2001
From: "Brian J. Watson" <brianwatson@google.com>
Date: Thu, 16 Jun 2016 17:47:30 -0700
Subject: [PATCH] Use google-gax 0.12.0, which depends on grpcio 0.14.0 or
 above

---
 setup.py | 2 +-
 tox.ini  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 977dd551523d..a37ccc80c1f6 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
 
 GRPC_EXTRAS = [
     'grpcio >= 0.14.0',
-    'google-gax >= 0.11.0',
+    'google-gax >= 0.12.0',
     'gax-google-pubsub-v1',
 ]
 
diff --git a/tox.ini b/tox.ini
index 1936e43c354c..4d01e63b5d72 100644
--- a/tox.ini
+++ b/tox.ini
@@ -24,7 +24,7 @@ covercmd =
 [grpc]
 deps =
     grpcio >= 0.14.0
-    google-gax >= 0.11.0
+    google-gax >= 0.12.0
     gax-google-pubsub-v1
 
 [testenv:py27]