projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4091ad a7631a1)
16314: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Tue, 25 Aug 2020 20:41:21 +0000 (16:41 -0400)
committerTom Clegg <tom@tomclegg.ca>
Tue, 25 Aug 2020 20:41:21 +0000 (16:41 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

1  2 
build/run-tests.sh patch | diff1 | diff2 | blob | history
tools/arvbox/bin/arvbox patch | diff1 | diff2 | blob | history

diff --cc build/run-tests.sh
Simple merge
diff --cc tools/arvbox/bin/arvbox
Simple merge