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)
commit37ab0eedec5eaf99c27b6b64fd04cc9248081713
tree1901a6dfe4126b1c49296e50ded41ac3f6dea1ae
parent8b1b770d208c2886c7b46a502f0d67d8fdcc919a
parente20adcd07cefcf4f35d6b778567fcfb46e197246
15954: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
lib/controller/federation/conn.go