projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8b1b770 e20adcd)
15954: Merge branch 'master'
authorTom Clegg <tom@tomclegg.ca>
Thu, 27 Feb 2020 14:25:20 +0000 (09:25 -0500)
committerTom Clegg <tom@tomclegg.ca>
Thu, 27 Feb 2020 14:25:20 +0000 (09:25 -0500)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

1  2 
lib/controller/federation/conn.go patch | diff1 | diff2 | blob | history

diff --cc lib/controller/federation/conn.go
Simple merge