Merge branch '3961-uuid-assignment-not-permitted'
authorTim Pierce <twp@curoverse.com>
Tue, 30 Sep 2014 17:01:07 +0000 (13:01 -0400)
committerTim Pierce <twp@curoverse.com>
Tue, 30 Sep 2014 17:07:30 +0000 (13:07 -0400)
commit6319bc1895aaf8d2a7f944e45e52c960f931a11e
tree52518a8f1b9f9bed35ca5c5a58bd3be943596fb8
parentb3fd3679187be8e51d31cb6bf17613cc488cda4b
parent6d6de24e35e291ef9b7a0f05def9b8e8ea5f7508
Merge branch '3961-uuid-assignment-not-permitted'

Closes #3961.
services/api/test/functional/arvados/v1/collections_controller_test.rb
services/api/test/functional/arvados/v1/groups_controller_test.rb