X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bf7687829f5222375441cf75c7d82d82a4f508c4..4dd469c1bd4c1f4a2edac6c2d63bc571e874aa3f:/services/api/Gemfile.lock

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index c3b518062c..18fce16819 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -35,18 +35,20 @@ GEM
     addressable (2.3.6)
     andand (1.3.3)
     arel (3.0.3)
-    arvados (0.1.20140513131358)
+    arvados (0.1.20140812162850)
       activesupport (>= 3.2.13)
       andand
       google-api-client (~> 0.6.3)
       json (>= 1.7.7)
-    arvados-cli (0.1.20140513131358)
+      jwt (>= 0.1.5, < 1.0.0)
+    arvados-cli (0.1.20140812162850)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1.0)
       curb (~> 0.8)
       google-api-client (~> 0.6.3)
       json (~> 1.7, >= 1.7.7)
+      jwt (>= 0.1.5, < 1.0.0)
       oj (~> 2.0, >= 2.0.3)
       trollop (~> 2.0)
     autoparse (0.3.3)
@@ -67,7 +69,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.7.0)
-    curb (0.8.5)
+    curb (0.8.6)
     daemon_controller (1.2.0)
     database_cleaner (1.2.0)
     erubis (2.7.0)
@@ -93,7 +95,7 @@ GEM
     highline (1.6.21)
     hike (1.2.3)
     httpauth (0.2.1)
-    i18n (0.6.9)
+    i18n (0.6.11)
     journey (1.0.4)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
@@ -108,7 +110,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    multi_json (1.10.0)
+    multi_json (1.10.1)
     multipart-post (1.2.0)
     net-scp (1.2.0)
       net-ssh (>= 2.6.5)
@@ -123,7 +125,7 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    oj (2.9.0)
+    oj (2.10.0)
     omniauth (1.1.1)
       hashie (~> 1.2)
       rack
@@ -139,6 +141,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)
@@ -188,6 +192,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sshkey (1.6.1)
     test_after_commit (0.2.3)
     themes_for_rails (0.5.1)
       rails (>= 3.0.0)
@@ -204,7 +209,7 @@ GEM
     uglifier (2.5.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    uuidtools (2.1.4)
+    uuidtools (2.1.5)
     websocket-driver (0.3.2)
 
 PLATFORMS
@@ -213,7 +218,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados-cli (>= 0.1.20140328152103)
+  arvados-cli (>= 0.1.20140708213257)
   coffee-rails (~> 3.2.0)
   database_cleaner
   faye-websocket
@@ -226,11 +231,13 @@ DEPENDENCIES
   passenger
   pg
   pg_power
+  puma
   rails (~> 3.2.0)
   rvm-capistrano
   sass-rails (>= 3.2.0)
   simplecov (~> 0.7.1)
   simplecov-rcov
+  sshkey
   test_after_commit
   themes_for_rails
   therubyracer