[ARVADOS] updated: b60e52e031eeba96ef1a301660de2f8cec4518b6

[git at public.curoverse.com]

Summary of changes:
 sdk/cli/bin/arv-run-pipeline-instance              | 36 ++++++++++++++-----
 services/api/Gemfile                               |  4 +--
 services/api/Gemfile.lock                          |  8 ++---
 .../api/app/controllers/application_controller.rb  | 42 +++++++++++++++++++++-
 .../arvados/v1/collections_controller_test.rb      | 18 ++++++++++
 5 files changed, 92 insertions(+), 16 deletions(-)

       via  b60e52e031eeba96ef1a301660de2f8cec4518b6 (commit)
       via  15f512c3d8bc8bf090972653b3e53742197316e8 (commit)
       via  1c679ba62c8d7b0d962532bdb5fa2de4c685d286 (commit)
       via  3b7e5549bf4a17907f8e3236592bcbd5cf6ad623 (commit)
      from  33a6cc0d0b748b4ec5a01db6218b8fa21afb11ed (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 b60e52e031eeba96ef1a301660de2f8cec4518b6
Merge: 33a6cc0 15f512c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 5 16:52:59 2014 -0400

    Merge branch '3822-ensure-unique-names' refs #3822
    
    Conflicts:
    	services/api/Gemfile
    	services/api/Gemfile.lock

diff --cc services/api/Gemfile
index fb8f43e,32a2fbd..cd7842c
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@@ -71,8 -71,7 +71,8 @@@ gem 'database_cleaner
  
  gem 'themes_for_rails'
  
- gem 'arvados', '>= 0.1.20140905115707'
- gem 'arvados-cli', '>= 0.1.20140905115707'
 -gem 'arvados-cli', '>= 0.1.20140905164626'
++gem 'arvados', '>= 0.1.20140905131846'
++gem 'arvados-cli', '>= 0.1.20140905131846'
  
  # pg_power lets us use partial indexes in schema.rb in Rails 3
  gem 'pg_power'
diff --cc services/api/Gemfile.lock
index 6d51948,3c711fc..13c0578
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@@ -35,7 -35,7 +35,7 @@@ GE
      addressable (2.3.6)
      andand (1.3.3)
      arel (3.0.3)
-     arvados (0.1.20140905115707)
 -    arvados (0.1.20140827170424)
++    arvados (0.1.20140905131846)
        activesupport (>= 3.2.13)
        andand
        google-api-client (~> 0.6.3)
@@@ -223,8 -223,7 +223,8 @@@ PLATFORM
  DEPENDENCIES
    acts_as_api
    andand
-   arvados (>= 0.1.20140905115707)
-   arvados-cli (>= 0.1.20140905115707)
 -  arvados-cli (>= 0.1.20140905164626)
++  arvados (>= 0.1.20140905131846)
++  arvados-cli (>= 0.1.20140905131846)
    coffee-rails (~> 3.2.0)
    database_cleaner
    factory_girl_rails

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


hooks/post-receive
--