13647: Merge branch 'master' into 13647-keepstore-config
authorTom Clegg <tclegg@veritasgenetics.com>
Tue, 10 Sep 2019 19:22:45 +0000 (15:22 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Tue, 10 Sep 2019 19:22:45 +0000 (15:22 -0400)
commit90d84d8578b760b493ac76b22c42bc284868bc0c
tree366b09cd1cf3b299891fd50e5890205fd9301afa
parent20a69e126c68236a3c73daab101e351346f8bfaf
parent04c702237cf2b545992ce7b1acad107a52118d72
13647: Merge branch 'master' into 13647-keepstore-config

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
lib/config/config.default.yml
lib/config/export.go
lib/config/generated_config.go
sdk/go/arvados/config.go