Merge branch '3822-ensure-unique-names' refs #3822
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 5 Sep 2014 20:52:59 +0000 (16:52 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 5 Sep 2014 20:52:59 +0000 (16:52 -0400)
commitb60e52e031eeba96ef1a301660de2f8cec4518b6
tree12d828a18183952ec0e5792e5f51918b4860ea00
parent33a6cc0d0b748b4ec5a01db6218b8fa21afb11ed
parent15f512c3d8bc8bf090972653b3e53742197316e8
Merge branch '3822-ensure-unique-names' refs #3822

Conflicts:
services/api/Gemfile
services/api/Gemfile.lock
services/api/Gemfile
services/api/Gemfile.lock
services/api/test/functional/arvados/v1/collections_controller_test.rb