Merge branch 'master' into 6663-git-server

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 58cd6c1a6e31159245856c6df00bd2486637e881..d671182a57c749b65bd9f7c93d2db215bc762f16 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -35,7 +35,7 @@ GEM
     addressable (2.3.8)
     andand (1.3.3)
     arel (3.0.3)
-    arvados (0.1.20150609141135)
+    arvados (0.1.20150615153458)
       activesupport (>= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       google-api-client (~> 0.6.3, >= 0.6.3)
@@ -44,7 +44,7 @@ GEM
     arvados-cli (0.1.20150205181653)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
-      arvados (~> 0.1, >= 0.1.20150128223554)
+      arvados (~> 0.1, >= 0.1.20150615153458)
       curb (~> 0.8)
       google-api-client (~> 0.6.3, >= 0.6.3)
       json (~> 1.7, >= 1.7.7)
@@ -227,7 +227,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados (>= 0.1.20150210011250)
+  arvados (>= 0.1.20150615153458)
   arvados-cli (>= 0.1.20150128223752)
   coffee-rails (~> 3.2.0)
   database_cleaner