projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69260a6 d106841)
Merge branch '17170-container-shell'
authorTom Clegg <tom@curii.com>
Fri, 5 Feb 2021 20:25:46 +0000 (15:25 -0500)
committerTom Clegg <tom@curii.com>
Fri, 5 Feb 2021 20:25:46 +0000 (15:25 -0500)
closes #17170

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

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