16306: Merge branch 'master'
authorTom Clegg <tom@curii.com>
Mon, 18 Jan 2021 18:55:27 +0000 (13:55 -0500)
committerTom Clegg <tom@curii.com>
Mon, 18 Jan 2021 18:55:27 +0000 (13:55 -0500)
commit41305b5ac71cc9a306dc654c42c11ffcc4258a47
treecb5d0e06bd14d2e4dfa004c580910bd830aeac50
parentb979f80113c4f8a4c13c96b4679c28788c099333
parent025639399f5c3c7c836109442cba71f38405149c
16306: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
lib/boot/supervisor.go