Merge remote-tracking branch 'origin/master' into 14714-keep-balance-config
authorEric Biagiotti <ebiagiotti@veritasgenetics.com>
Mon, 30 Sep 2019 16:31:13 +0000 (12:31 -0400)
committerEric Biagiotti <ebiagiotti@veritasgenetics.com>
Mon, 30 Sep 2019 16:31:13 +0000 (12:31 -0400)
commit52b7b2934d5d74ee67ca13f8d1cc95f1379faddc
treeea1a11c8d6db5725ba88ed9089c0646f05e58c30
parent8db3a110976bbb9288214eeb3064d31cb12c1c82
parentfcb08f0ca7794b05c77a15ab8bd46b978cb07778
Merge remote-tracking branch 'origin/master' into 14714-keep-balance-config

refs #14714

Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti@veritasgenetics.com>
lib/config/deprecated.go
lib/config/load.go