projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1eed358 65219ea)
Merge branch '16736-max-token-lifetime'
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 19 Feb 2021 20:30:14 +0000 (17:30 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 19 Feb 2021 20:30:14 +0000 (17:30 -0300)
Closes #16736

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

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