[ARVADOS] updated: 20abd5d545f9f1102bcd28ee4cab7a2453e28cb4

[git at public.curoverse.com]

Summary of changes:
 doc/api/schema/Collection.html.textile.liquid      |  11 +--
 sdk/python/arvados/commands/put.py                 |  22 +++--
 sdk/python/tests/test_arv_put.py                   |   2 +-
 .../controllers/arvados/v1/schema_controller.rb    |   1 +
 services/api/app/models/collection.rb              |  73 +++++++++------
 services/api/config/application.default.yml        |   6 +-
 ...20150206230342_rename_replication_attributes.rb |  30 ++++++
 services/api/db/structure.sql                      |  14 +--
 services/api/test/fixtures/collections.yml         |  42 +++++++++
 .../arvados/v1/collections_controller_test.rb      |  14 +--
 services/api/test/unit/arvados_model_test.rb       |   2 +-
 services/api/test/unit/collection_test.rb          | 104 ++++++++++++++++++++-
 12 files changed, 259 insertions(+), 62 deletions(-)
 create mode 100644 services/api/db/migrate/20150206230342_rename_replication_attributes.rb

       via  20abd5d545f9f1102bcd28ee4cab7a2453e28cb4 (commit)
       via  d87717b4ec885059183ef6d7fa6780c343338455 (commit)
       via  eff37344f3cecd5aed259c9852aca4bdcdfb6922 (commit)
       via  11e1ee67236b1dda5dac5e871ecfedd7de8faccf (commit)
       via  1e423bd9887adad61999503771b0794fc62efc28 (commit)
       via  938338a385a96066552aea6230d773a17cbf3c3e (commit)
       via  1f7a6b50cabab4c8645dd6db92e456c080f2a81c (commit)
       via  08c575dc24bbc5732a5fcb1126c23d9a4ca10b73 (commit)
       via  d302307a4a66867419722034228823d1fc3910a6 (commit)
       via  d62b73382398808a440f15fdda2eea2e15e44282 (commit)
       via  966bd97704f635315ab7ba50f23590a5fc9a97be (commit)
       via  ec0c0f54da513b2b8221d65d9a2c621a7d95d79e (commit)
       via  353a72e637532f2641e55c79edc0de52e2dd3508 (commit)
      from  0fd86b9728a80ef07d65fbf0a8278b4a7e44c57a (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 20abd5d545f9f1102bcd28ee4cab7a2453e28cb4
Merge: 0fd86b9 d87717b
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 16 15:49:24 2015 -0500

    Merge branch 'master' into 5197-collection-name-owner-unique
    
    Conflicts:
    	services/api/db/structure.sql

diff --cc services/api/db/structure.sql
index aded465,756dfc9..1332995
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@@ -2359,4 -2358,4 +2359,6 @@@ INSERT INTO schema_migrations (version
  
  INSERT INTO schema_migrations (version) VALUES ('20150206210804');
  
- INSERT INTO schema_migrations (version) VALUES ('20150216193428');
 -INSERT INTO schema_migrations (version) VALUES ('20150206230342');
++INSERT INTO schema_migrations (version) VALUES ('20150206230342');
++
++INSERT INTO schema_migrations (version) VALUES ('20150216193428');

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


hooks/post-receive
--