Merge branch 'master' into 16678-login-tokens-lifetime-config
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 21 Aug 2020 21:09:09 +0000 (18:09 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 21 Aug 2020 21:10:46 +0000 (18:10 -0300)
commit614145d096375ae18c7020e8f9205eaa2a1d0d39
treed277112d821f76b6cbe4a2c81597f1b0df5817ee
parent0371c7348509369fe338951b0df86325819622d5
parent66c7c739d2320e8b75cfd31e58290bca582f120c
Merge branch 'master' into 16678-login-tokens-lifetime-config

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>
lib/config/config.default.yml
lib/config/export.go
lib/config/generated_config.go
sdk/go/arvados/config.go