projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea42eaf 89e1388)
Merge branch 'master' into 15577-ownership-transfer
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 18 Nov 2019 17:20:58 +0000 (12:20 -0500)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 18 Nov 2019 17:20:58 +0000 (12:20 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history

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