Merge branch 'master' into 3036-collection-uuids
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 26 Aug 2014 14:43:41 +0000 (10:43 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 26 Aug 2014 14:43:41 +0000 (10:43 -0400)
commit41a6554ca2281983645cf606ba6291cc2332dced
treeb681dd3d453f9ed8ff225f3b0497494ecf11f7d0
parentf1886a6d0c1dadd06ec751f25c5c1e9469825e1a
parent79577fec16a8f43c0d00ce693e06fcd3770bf2bf
Merge branch 'master' into 3036-collection-uuids

Conflicts:
services/api/test/fixtures/groups.yml
services/api/app/controllers/application_controller.rb
services/api/app/controllers/arvados/v1/groups_controller.rb
services/api/app/models/arvados_model.rb
services/api/test/fixtures/groups.yml
services/api/test/functional/arvados/v1/groups_controller_test.rb