[ARVADOS] updated: 350c01c50d131eaf01f52eb660ed8e63835177d6

git at public.curoverse.com git at public.curoverse.com
Thu Jul 3 11:31:04 EDT 2014


Summary of changes:
 services/api/Gemfile      | 2 +-
 services/api/Gemfile.lock | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

       via  350c01c50d131eaf01f52eb660ed8e63835177d6 (commit)
      from  02226bdb54db7b8db0468409f6495b6daf82ad71 (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 350c01c50d131eaf01f52eb660ed8e63835177d6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jul 3 11:31:01 2014 -0400

    Update arvados-cli dependency of API server so crunch-dispatch.rb uses
    arv-run-pipeline-instance from commit:c806ef1
    no issue #

diff --git a/services/api/Gemfile b/services/api/Gemfile
index 3290602..ee4120e 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -70,7 +70,7 @@ gem 'database_cleaner'
 
 gem 'themes_for_rails'
 
-gem 'arvados-cli', '>= 0.1.20140630151639'
+gem 'arvados-cli', '>= 0.1.20140703110309'
 
 # pg_power lets us use partial indexes in schema.rb in Rails 3
 gem 'pg_power'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 3167a75..30f10c3 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.20140630151639)
+    arvados (0.1.20140703110309)
       activesupport (>= 3.2.13)
       andand
       google-api-client (~> 0.6.3)
       json (>= 1.7.7)
-    arvados-cli (0.1.20140630151639)
+      jwt (>= 0.1.5, < 1.0.0)
+    arvados-cli (0.1.20140703110309)
       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)
@@ -215,7 +217,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados-cli (>= 0.1.20140630151639)
+  arvados-cli (>= 0.1.20140703110309)
   coffee-rails (~> 3.2.0)
   database_cleaner
   faye-websocket

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list