Merge branch '4310-lock-before-fail' closes #4310 (again)

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index bb327d05576d7374d51647ffb066785000087276..ce79f854dea56e3006fe049ee52988c690839ded 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -41,12 +41,12 @@ GEM
       google-api-client (~> 0.6.3)
       json (>= 1.7.7)
       jwt (>= 0.1.5, < 1.0.0)
-    arvados-cli (0.1.20140919104705)
+    arvados-cli (0.1.20141014201516)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
-      arvados (~> 0.1.0)
+      arvados (~> 0.1, >= 0.1.0)
       curb (~> 0.8)
-      google-api-client (~> 0.6.3)
+      google-api-client (~> 0.6, >= 0.6.3)
       json (~> 1.7, >= 1.7.7)
       jwt (>= 0.1.5, < 1.0.0)
       oj (~> 2.0, >= 2.0.3)
@@ -224,7 +224,7 @@ DEPENDENCIES
   acts_as_api
   andand
   arvados (>= 0.1.20140919104705)
-  arvados-cli (>= 0.1.20140919104705)
+  arvados-cli (>= 0.1.20141014201516)
   coffee-rails (~> 3.2.0)
   database_cleaner
   factory_girl_rails