3410: Merge branch 'master' into 3410-replication-attrs
authorTom Clegg <tom@curoverse.com>
Mon, 16 Feb 2015 19:13:00 +0000 (14:13 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 16 Feb 2015 19:13:00 +0000 (14:13 -0500)
commiteff37344f3cecd5aed259c9852aca4bdcdfb6922
treed67e3ffa6e4769278d84f242e191a9a2856aa840
parent11e1ee67236b1dda5dac5e871ecfedd7de8faccf
parentfd172dd6875c8bf1481c6e078590c0ccef934bca
3410: Merge branch 'master' into 3410-replication-attrs

Conflicts:
services/api/test/fixtures/collections.yml
services/api/test/unit/collection_test.rb
sdk/python/tests/test_arv_put.py
services/api/app/controllers/arvados/v1/schema_controller.rb
services/api/app/models/collection.rb
services/api/test/fixtures/collections.yml
services/api/test/functional/arvados/v1/collections_controller_test.rb
services/api/test/unit/collection_test.rb