Merge branch 'master' into 2380-ssh-doc

[arvados.git] / services / api / Gemfile

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 105295db46c5df600b8e1eb303c237a0e59ae6e4..e5235a57a0f54adbce3bf49b2df6ca373780af97 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -70,7 +70,9 @@ gem 'database_cleaner'
 
 gem 'themes_for_rails'
 
-gem 'arvados-cli', '>= 0.1.20140328152103'
+gem 'arvados-cli', '>= 0.1.20140703225421'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'
+
+gem 'puma'