Merge branch 'master' into 10259-cwl-pipeline-null

[arvados.git] / services / api / Gemfile.lock

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 391a26c2a859945635772864a8d0ef642c7d47be..548dc20eb64eac8784b1398ea13868259b8b0630 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -42,12 +42,12 @@ GEM
       i18n (~> 0)
       json (~> 1.7, >= 1.7.7)
       jwt (>= 0.1.5, < 2)
-    arvados-cli (0.1.20160503204200)
+    arvados-cli (0.1.20161017181634)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1, >= 0.1.20150128223554)
       curb (~> 0.8)
-      google-api-client (~> 0.6, >= 0.6.3, < 0.9)
+      google-api-client (~> 0.6, >= 0.6.3, < 0.8.9)
       json (~> 1.7, >= 1.7.7)
       oj (~> 2.0, >= 2.0.3)
       trollop (~> 2.0)
@@ -236,7 +236,7 @@ DEPENDENCIES
   acts_as_api
   andand
   arvados (>= 0.1.20150615153458)
-  arvados-cli (>= 0.1.20151207150126)
+  arvados-cli (>= 0.1.20161017181634)
   coffee-rails (~> 3.2.0)
   database_cleaner
   factory_girl_rails
@@ -266,6 +266,3 @@ DEPENDENCIES
   therubyracer
   trollop
   uglifier (>= 1.0.3)
-
-BUNDLED WITH
-   1.12.1