5737: Merge branch 'master' into 5737-ruby231

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

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index d9edcc64fa4ee48e455e4ad17dff6ac3821b5172..3e551a0c3fab6d425de31b8f3354ba7f1474edfe 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -42,7 +42,7 @@ GEM
       i18n (~> 0)
       json (~> 1.7, >= 1.7.7)
       jwt (>= 0.1.5, < 2)
-    arvados-cli (0.1.20160913140509)
+    arvados-cli (0.1.20161017193526)
       activesupport (~> 3.2, >= 3.2.13)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1, >= 0.1.20150128223554)
@@ -258,8 +258,8 @@ DEPENDENCIES
   acts_as_api
   andand
   arvados (>= 0.1.20150615153458)
-  arvados-cli (>= 0.1.20151207150126)
-  coffee-rails (~> 3.2)
+  arvados-cli (>= 0.1.20161017193526)
+  coffee-rails (~> 3.2.0)
   database_cleaner
   factory_girl_rails
   faye-websocket