projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7db9eeb e5838a1)
Merge branch '16745-keep-web-cache'
authorTom Clegg <tom@curii.com>
Wed, 3 Mar 2021 18:25:22 +0000 (13:25 -0500)
committerTom Clegg <tom@curii.com>
Wed, 3 Mar 2021 18:25:22 +0000 (13:25 -0500)
fixes #16745

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
lib/config/config.default.yml 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/generated_config.go
Simple merge
diff --cc sdk/go/arvados/config.go
Simple merge