projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20a69e1 04c7022)
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)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
lib/config/export.go patch | diff1 | diff2 | blob | history
lib/config/generated_config.go patch | diff1 | diff2 | blob | history
sdk/go/arvados/config.go patch | diff1 | diff2 | blob | history

diff --cc lib/config/config.default.yml
Simple merge
diff --cc lib/config/export.go
Simple merge
diff --cc lib/config/generated_config.go
Simple merge
diff --cc sdk/go/arvados/config.go
Simple merge