git.arvados.org - arvados.git/commit

author	Lucas Di Pentima <ldipentima@veritasgenetics.com>
	Fri, 5 Oct 2018 13:09:16 +0000 (10:09 -0300)
committer	Lucas Di Pentima <ldipentima@veritasgenetics.com>
	Fri, 5 Oct 2018 13:09:16 +0000 (10:09 -0300)
commit	0f11eb78e075445d1769b445ee12328bdb397781
tree	f34fcacef9825f4d913243db4e2b4b2fd45b92f6	tree \| snapshot
parent	728b7ee1f1501e8bf5b5f9c4310d1fb5475ec79e	commit \| diff
parent	04b9d6e93ca8bd18dca697e56689820516c8c572	commit \| diff

Merge branch 'master' into 13561-collection-versions-api

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

services/api/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/models/collection.rb	diff1 \|	diff2 \|	blob \| history
services/api/config/application.default.yml	diff1 \|	diff2 \|	blob \| history
services/api/db/structure.sql	diff1 \|	diff2 \|	blob \| history
services/api/test/functional/arvados/v1/collections_controller_test.rb	diff1 \|	diff2 \|	blob \| history