[ARVADOS] updated: 73688a1ef6387fe8a8b1b2f09a8936198f79d66e

[git at public.curoverse.com]

Summary of changes:
 services/api/Gemfile      | 2 ++
 services/api/Gemfile.lock | 3 +++
 2 files changed, 5 insertions(+)

       via  73688a1ef6387fe8a8b1b2f09a8936198f79d66e (commit)
      from  f0d8ab52b77f74e9294fe634207ce6e1ff9748a1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 73688a1ef6387fe8a8b1b2f09a8936198f79d66e
Author: Ward Vandewege <ward at curoverse.com>
Date:   Mon Jun 9 16:33:01 2014 -0400

    Add puma to the Gemfile for the API server; we use it for the websockets
    server.
    
    no issue #

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 105295d..ce4162d 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -74,3 +74,5 @@ gem 'arvados-cli', '>= 0.1.20140328152103'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'
+
+gem 'puma'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index c3b5180..5f66bb2 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -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)
@@ -226,6 +228,7 @@ DEPENDENCIES
   passenger
   pg
   pg_power
+  puma
   rails (~> 3.2.0)
   rvm-capistrano
   sass-rails (>= 3.2.0)

-----------------------------------------------------------------------


hooks/post-receive
--