projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 30db189 f902c30)
Merge branch '11016-doc-signing-ttl'
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 3 Oct 2019 15:39:18 +0000 (11:39 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Thu, 3 Oct 2019 15:39:18 +0000 (11:39 -0400)
refs #11016

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/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