projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 53da7a1 cd04b8b)
16053: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Tue, 31 Mar 2020 17:52:23 +0000 (13:52 -0400)
committerTom Clegg <tom@tomclegg.ca>
Tue, 31 Mar 2020 17:52:23 +0000 (13:52 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

1  2 
build/run-tests.sh patch | diff1 | diff2 | blob | history
lib/boot/supervisor.go patch | diff1 | diff2 | blob | history

diff --cc build/run-tests.sh
Simple merge
diff --cc lib/boot/supervisor.go
Simple merge