git.arvados.org - arvados.git/commit

author	Tom Clegg <tclegg@veritasgenetics.com>
	Fri, 24 May 2019 19:11:45 +0000 (15:11 -0400)
committer	Tom Clegg <tclegg@veritasgenetics.com>
	Fri, 24 May 2019 19:11:57 +0000 (15:11 -0400)
commit	15c688d1c4b41232536d0a275dd5c0fdb8879a00
tree	490db265e48ecef1db2e8f351a9bd2621cb50675	tree \| snapshot
parent	8ee2632316f61a63f5af52e84e1538e26850005e	commit \| diff
parent	cdc0e1acba106e4c6f857d1b394eaa5d38fde428	commit \| diff

15003: Merge branch 'master'

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

lib/config/config.default.yml	diff1 \|	diff2 \|	blob \| history
lib/config/generated_config.go	diff1 \|	diff2 \|	blob \| history
lib/config/load_test.go	diff1 \|	diff2 \|	blob \| history
lib/service/cmd.go	diff1 \|	diff2 \|	blob \| history
sdk/python/tests/run_test_server.py	diff1 \|	diff2 \|	blob \| history