2879: API server can find_or_create Jobs based on filters.

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 4f98881d534ceb2ed63f6d3baf81c27042d23485..5f66bb2220f98db9ea3316dacd1a02351db8b2fa 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.20140513101345)
+    arvados (0.1.20140513131358)
       activesupport (>= 3.2.13)
       andand
       google-api-client (~> 0.6.3)
       json (>= 1.7.7)
-    arvados-cli (0.1.20140513101345)
+    arvados-cli (0.1.20140513131358)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1.0)
@@ -139,6 +139,8 @@ GEM
       pg
       rails (~> 3.1)
     polyglot (0.3.4)
+    puma (2.8.2)
+      rack (>= 1.1, < 2.0)
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -164,7 +166,6 @@ GEM
     rake (10.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.7)
     ref (1.0.5)
     rvm-capistrano (1.5.1)
       capistrano (~> 2.15.4)
@@ -227,8 +228,8 @@ DEPENDENCIES
   passenger
   pg
   pg_power
+  puma
   rails (~> 3.2.0)
-  redis
   rvm-capistrano
   sass-rails (>= 3.2.0)
   simplecov (~> 0.7.1)