git.arvados.org - arvados.git/commit

author	Tom Clegg <tclegg@veritasgenetics.com>
	Mon, 27 Nov 2017 20:22:08 +0000 (15:22 -0500)
committer	Tom Clegg <tclegg@veritasgenetics.com>
	Mon, 27 Nov 2017 20:22:08 +0000 (15:22 -0500)
commit	07a2b2c0e743f36be03e746a7e265986db555d3e
tree	fdc6f15ce9697a998d8860289be367a212c7e83e	tree \| snapshot
parent	3ed14dc61e8d39d748d0e7c25d12e4e5c45e09a8	commit \| diff
parent	cac7dd48497923fc0141a8c4f928b524a38fbfac	commit \| diff

Merge branch 'master' into 11453-federated-tokens

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

build/run-tests.sh	diff1 \|	diff2 \|	blob \| history
services/api/Gemfile	diff1 \|	diff2 \|	blob \| history
services/api/Gemfile.lock	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/application_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/controllers/arvados/v1/schema_controller.rb	diff1 \|	diff2 \|	blob \| history
services/api/app/middlewares/arvados_api_token.rb	diff1 \|	diff2 \|	blob \| history