projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91ce664 c8f84a3)
16625: Merge branch 'master' into 16625-add-azure-managed-image-support
authorWard Vandewege <ward@curii.com>
Thu, 20 Aug 2020 14:28:09 +0000 (10:28 -0400)
committerWard Vandewege <ward@curii.com>
Thu, 20 Aug 2020 14:28:30 +0000 (10:28 -0400)
Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@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