Sfoglia il codice sorgente

Merge pull request #40801 from thaJeztah/19.03_backport_update_go_events

[19.03 backport] vendor: update go-events to fix alignment for 32bit systems
Brian Goff 5 anni fa
parent
commit
25b82fa9b8
2 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 1 1
      vendor.conf
  2. 1 1
      vendor/github.com/docker/go-events/retry.go

+ 1 - 1
vendor.conf

@@ -39,7 +39,7 @@ github.com/gofrs/flock                              7f43ea2e6a643ad441fc12d0ecc0
 
 # When updating, also update LIBNETWORK_COMMIT in hack/dockerfile/install/proxy.installer accordingly
 github.com/docker/libnetwork                        b9bcf0c3fba9ef8897c9676c5b70ba0345b84b17 # bump_19.03 branch
-github.com/docker/go-events                         9461782956ad83b30282bf90e31fa6a70c255ba9
+github.com/docker/go-events                         e31b211e4f1cd09aa76fe4ac244571fab96ae47f
 github.com/armon/go-radix                           e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
 github.com/armon/go-metrics                         eb0af217e5e9747e41dd5303755356b62d28e3ec
 github.com/hashicorp/go-msgpack                     71c2886f5a673a35f909803f38ece5810165097b

+ 1 - 1
vendor/github.com/docker/go-events/retry.go

@@ -203,8 +203,8 @@ type ExponentialBackoffConfig struct {
 // ExponentialBackoff implements random backoff with exponentially increasing
 // bounds as the number consecutive failures increase.
 type ExponentialBackoff struct {
+	failures uint64 // consecutive failure counter (needs to be 64-bit aligned)
 	config   ExponentialBackoffConfig
-	failures uint64 // consecutive failure counter.
 }
 
 // NewExponentialBackoff returns an exponential backoff strategy with the