Skip to content

Commit 3a42886

Browse files
authored
Merge pull request kubernetes#94711 from jingyih/update_etcd
Bump etcd to dd1b699fc489
2 parents 5dd2676 + 5ee8e8e commit 3a42886

File tree

11 files changed

+57
-51
lines changed

11 files changed

+57
-51
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ require (
9797
github.com/urfave/negroni v1.0.0 // indirect
9898
github.com/vishvananda/netlink v1.1.0
9999
github.com/vmware/govmomi v0.20.3
100-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
100+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
101101
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
102102
golang.org/x/net v0.0.0-20200707034311-ab3426394381
103103
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
@@ -415,7 +415,7 @@ replace (
415415
github.com/xordataexchange/crypt => github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77
416416
github.com/yuin/goldmark => github.com/yuin/goldmark v1.1.27
417417
go.etcd.io/bbolt => go.etcd.io/bbolt v1.3.5
418-
go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b // ae9734ed278b is the SHA for git tag v3.4.13
418+
go.etcd.io/etcd => go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 // ae9734ed278b is the SHA for git tag v3.4.13
419419
go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.1.2
420420
go.opencensus.io => go.opencensus.io v0.22.2
421421
go.uber.org/atomic => go.uber.org/atomic v1.4.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -467,8 +467,8 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:
467467
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
468468
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
469469
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
470-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b h1:3kC4J3eQF6p1UEfQTkC67eEeb3rTk+shQqdX6tFyq9Q=
471-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
470+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489 h1:1JFLBqwIgdyHN1ZtgjTBwO+blA6gVOmZurpiMEsETKo=
471+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
472472
go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA=
473473
go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
474474
go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs=

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
github.com/spf13/cobra v1.0.0
1919
github.com/spf13/pflag v1.0.5
2020
github.com/stretchr/testify v1.4.0
21-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
21+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
2222
google.golang.org/grpc v1.27.0
2323
gopkg.in/yaml.v2 v2.2.8
2424
k8s.io/api v0.0.0

staging/src/k8s.io/apiextensions-apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require (
3131
github.com/stretchr/testify v1.4.0
3232
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
3333
go.etcd.io/bbolt v1.3.5 // indirect
34-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200824191128-ae9734ed278b
34+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
3535
go.uber.org/zap v1.10.0
3636
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
3737
golang.org/x/net v0.0.0-20200707034311-ab3426394381

staging/src/k8s.io/apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/kube-aggregator/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/legacy-cloud-providers/go.sum

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/src/k8s.io/sample-apiserver/go.sum

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.etcd.io/etcd/integration/cluster.go

Lines changed: 40 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)