Merge branch 'master' into 14715-keepprox-config
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Wed, 14 Aug 2019 14:49:48 +0000 (10:49 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Wed, 14 Aug 2019 14:49:48 +0000 (10:49 -0400)
commitd4ed3e6460469f2766e1f1676c538d6c86e000b6
tree3995607b78fcaddffba42f17e0c85e3d8307e6e5
parent1166aeb6033725709ded753a0c00f69320a9a873
parent86b7903116608ac3a8314437639cb61d774fb510
Merge branch 'master' into 14715-keepprox-config

refs #14715

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
doc/admin/upgrading.html.textile.liquid
lib/config/config.default.yml
lib/config/deprecated.go
lib/config/export.go
lib/config/generated_config.go
lib/config/load.go
sdk/go/arvados/config.go
sdk/python/tests/run_test_server.py
tools/arvbox/lib/arvbox/docker/cluster-config.sh
tools/arvbox/lib/arvbox/docker/service/keepproxy/run-service