projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c1bd1ee 0b38c1d)
Merge branch '16679-wb2-idle-timeout-config'. Refs #16679
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Wed, 2 Sep 2020 19:12:20 +0000 (16:12 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Wed, 2 Sep 2020 19:12:20 +0000 (16:12 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

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