git.arvados.org - arvados.git/commit

author	Lucas Di Pentima <ldipentima@veritasgenetics.com>
	Tue, 6 Aug 2019 19:36:27 +0000 (16:36 -0300)
committer	Lucas Di Pentima <ldipentima@veritasgenetics.com>
	Tue, 6 Aug 2019 19:36:27 +0000 (16:36 -0300)
commit	acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2
tree	11e00a4c0a64af52f86938c55bdd693c3bdaf6a2	tree \| snapshot
parent	2c7b49e8791154db907616243c930c552aeb3df3	commit \| diff
parent	1ea751256b6817e0c841e0a9c4b99d559de6f0b0	commit \| diff

Merge branch 'master' into 14716-webdav-cluster-config

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

lib/config/config.default.yml	diff1 \|	diff2 \|	blob \| history
lib/config/deprecated.go	diff1 \|	diff2 \|	blob \| history
lib/config/export.go	diff1 \|	diff2 \|	blob \| history
lib/config/generated_config.go	diff1 \|	diff2 \|	blob \| history
sdk/go/arvados/config.go	diff1 \|	diff2 \|	blob \| history
services/keep-web/handler.go	diff1 \|	diff2 \|	blob \| history
services/keep-web/handler_test.go	diff1 \|	diff2 \|	blob \| history
services/keep-web/server_test.go	diff1 \|	diff2 \|	blob \| history