0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #42513 from awmirantis/bump-swarmkit

Browse source
This commit is contained in:
Akihiro Suda 2021-06-11 11:45:12 +09:00 • committed by GitHub
commit a062d526f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vendor.conf
View file

@ -145,7 +145,7 @@ github.com/klauspost/compress a3b7545c88eea469c2246bee0e6c
github.com/pelletier/go-toml 65ca8064882c8c308e5c804c5d5443d409e0738c # v1.8.1
# cluster
github.com/docker/swarmkit 62d78f2485243398fbf0ad4770d674b44797308a # master
github.com/docker/swarmkit ccf0585f543eae7d74104ddd8f339a960322d214 # master
github.com/gogo/protobuf b03c65ea87cdc3521ede29f62fe3ce239267c1bc # v1.3.2
github.com/golang/protobuf 84668698ea25b64748563aa20726db66a6b8d299 # v1.3.5
github.com/cloudflare/cfssl 5d63dbd981b5c408effbb58c442d54761ff94fbd # 1.3.2

5
vendor/github.com/docker/swarmkit/manager/orchestrator/update/updater.go generated vendored
View file

@ -280,6 +280,11 @@ slotsLoop:
wg.Wait()
if !stopped {
// if a delay is set we need to monitor for a period longer than the delay
// otherwise we will leave the monitorLoop before the task is done delaying
if updateConfig.Delay >= monitoringPeriod {
monitoringPeriod = updateConfig.Delay + 1*time.Second
}
// Keep watching for task failures for one more monitoringPeriod,
// before declaring the update complete.
doneMonitoring := time.After(monitoringPeriod)