projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
cc0e5b0
e4a6240
)
Merge branch '17175-boot-fail-rake-seed'
author
Tom Clegg <tom@curii.com>
Wed, 6 Jan 2021 14:45:14 +0000
(09:45 -0500)
committer
Tom Clegg <tom@curii.com>
Wed, 6 Jan 2021 14:45:14 +0000
(09:45 -0500)
fixes #17175
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
1
2
lib/boot/supervisor.go
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/boot/supervisor.go
Simple merge