15003: Merge branch 'master' into 15003-preprocess-config
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 15 May 2019 13:57:36 +0000 (09:57 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 15 May 2019 13:57:36 +0000 (09:57 -0400)
commit42b483f3a722ad8a506040160e54d0080a197318
tree3c3e3d9b25e6c729f578f044eacd522e6fabb241
parentd6e0bfffc0e79ef129d89ae220dcbebb6dc474a7
parent5d3c8552f70ddd6b1ed5397e3650020e88538224
15003: Merge branch 'master' into 15003-preprocess-config

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
services/api/config/arvados_config.rb