Merge branch 'master' into 3118-docker-fixes

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 5f66bb2220f98db9ea3316dacd1a02351db8b2fa..3167a75ba77d4fae8bd29f96b78d50710f6201ed 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -35,12 +35,12 @@ GEM
     addressable (2.3.6)
     andand (1.3.3)
     arel (3.0.3)
-    arvados (0.1.20140513131358)
+    arvados (0.1.20140630151639)
       activesupport (>= 3.2.13)
       andand
       google-api-client (~> 0.6.3)
       json (>= 1.7.7)
-    arvados-cli (0.1.20140513131358)
+    arvados-cli (0.1.20140630151639)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1.0)
@@ -215,7 +215,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados-cli (>= 0.1.20140328152103)
+  arvados-cli (>= 0.1.20140630151639)
   coffee-rails (~> 3.2.0)
   database_cleaner
   faye-websocket