Skip to content

Commit b42e3b1

Browse files
committed
Upgrade etcd to 3.3.17
I originally intended to upgrade etcd to 3.4.2, but at this time, the module is broken, and cannot be included, under the original import path, or the new go.etcd.io import path. See etcd-io/etcd#11154 for more info. Closes #3278 Signed-off-by: Eric Chlebek <[email protected]>
1 parent 9ca66d2 commit b42e3b1

File tree

2 files changed

+228
-114
lines changed

2 files changed

+228
-114
lines changed

go.mod

Lines changed: 33 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,17 @@ go 1.12
55
require (
66
github.com/AlecAivazis/survey v1.4.1
77
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
8-
github.com/BurntSushi/toml v0.3.1 // indirect
98
github.com/NYTimes/gziphandler v0.0.0-20180227021810-5032c8878b9d
109
github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
1110
github.com/ash2k/stager v0.0.0-20170622123058-6e9c7b0eacd4 // indirect
1211
github.com/atlassian/gostatsd v0.0.0-20180514010436-af796620006e
13-
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a // indirect
14-
github.com/coreos/bbolt v1.3.1-coreos.6 // indirect
15-
github.com/coreos/etcd v3.3.13+incompatible
16-
github.com/coreos/go-systemd v0.0.0-20170731111925-d21964639418 // indirect
17-
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf
12+
github.com/coreos/bbolt v1.3.3 // indirect
13+
github.com/coreos/etcd v3.3.17+incompatible
14+
github.com/coreos/go-semver v0.3.0 // indirect
15+
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect
16+
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
1817
github.com/dave/jennifer v0.0.0-20171207062344-d8bdbdbee4e1
19-
github.com/dgrijalva/jwt-go v3.0.0+incompatible
18+
github.com/dgrijalva/jwt-go v3.2.0+incompatible
2019
github.com/docker/docker v0.0.0-20180409082103-cbde00b44273
2120
github.com/dsnet/compress v0.0.0-20170928175515-f41072d47fff // indirect
2221
github.com/echlebek/crock v1.0.1
@@ -25,85 +24,67 @@ require (
2524
github.com/ghodss/yaml v1.0.0
2625
github.com/go-ole/go-ole v0.0.0-20170209151332-de8695c8edbf // indirect
2726
github.com/go-resty/resty v0.0.0-20170925192930-9ac9c42358f7
28-
github.com/gogo/protobuf v1.2.1
29-
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
30-
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
31-
github.com/golang/protobuf v1.1.0
27+
github.com/gogo/protobuf v1.3.1
28+
github.com/golang/groupcache v0.0.0-20191002201903-404acd9df4cc // indirect
29+
github.com/golang/protobuf v1.3.2
3230
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
33-
github.com/google/btree v0.0.0-20161217183710-316fb6d3f031 // indirect
34-
github.com/google/go-cmp v0.3.0 // indirect
35-
github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c
31+
github.com/google/uuid v1.1.1
3632
github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect
3733
github.com/gorilla/mux v1.6.2
38-
github.com/gorilla/websocket v1.2.0
34+
github.com/gorilla/websocket v1.4.1
3935
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
4036
github.com/graph-gophers/dataloader v0.0.0-20180104184831-78139374585c
4137
github.com/graphql-go/graphql v0.7.9-0.20190403165646-199d20bbfed7
42-
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
43-
github.com/grpc-ecosystem/go-grpc-prometheus v0.0.0-20160910222444-6b7015e65d36 // indirect
44-
github.com/grpc-ecosystem/grpc-gateway v1.3.0 // indirect
38+
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
39+
github.com/grpc-ecosystem/grpc-gateway v1.11.3 // indirect
4540
github.com/gxed/GoEndian v0.0.0-20160916112711-0f5c6873267e // indirect
4641
github.com/gxed/eventfd v0.0.0-20160916113412-80a92cca79a8 // indirect
4742
github.com/hashicorp/go-version v1.2.0
48-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
4943
github.com/ipfs/go-log v0.0.0-20180416040000-7ecd3df29a4a // indirect
5044
github.com/jbenet/go-reuseport v0.0.0-20180416043609-15a1cd37f050 // indirect
51-
github.com/jonboulle/clockwork v0.1.0 // indirect
52-
github.com/json-iterator/go v1.1.6
45+
github.com/json-iterator/go v1.1.7
46+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
5347
github.com/libp2p/go-reuseport v0.0.0-20180416043609-15a1cd37f050 // indirect
5448
github.com/libp2p/go-sockaddr v0.0.0-20180329070516-f3e9f73a53d1 // indirect
5549
github.com/mattn/go-colorable v0.0.9 // indirect
5650
github.com/mattn/go-isatty v0.0.2 // indirect
5751
github.com/mattn/go-runewidth v0.0.2 // indirect
58-
github.com/matttproud/golang_protobuf_extensions v1.0.0 // indirect
5952
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
6053
github.com/mholt/archiver v0.0.0-20180816053333-85d3d0b511ea
61-
github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
54+
github.com/mitchellh/go-homedir v1.1.0
6255
github.com/mitchellh/mapstructure v1.1.2
63-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
64-
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
6556
github.com/nwaples/rardecode v0.0.0-20170112110516-f22b7ef81a0a // indirect
6657
github.com/olekukonko/tablewriter v0.0.0-20180506121414-d4647c9c7a84
67-
github.com/opentracing/opentracing-go v1.0.2 // indirect
6858
github.com/pierrec/lz4 v0.0.0-20171218195038-2fcda4cb7018 // indirect
6959
github.com/pierrec/xxHash v0.1.1 // indirect
70-
github.com/pkg/errors v0.8.1 // indirect
71-
github.com/prometheus/client_golang v0.8.0
72-
github.com/prometheus/client_model v0.0.0-20170216185247-6f3806018612
73-
github.com/prometheus/common v0.0.0-20170908161822-2f17f4a9d485 // indirect
74-
github.com/prometheus/procfs v0.0.0-20170703101242-e645f4e5aaa8 // indirect
60+
github.com/prometheus/client_golang v1.2.0
61+
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
7562
github.com/robertkrimen/otto v0.0.0-20180617131154-15f95af6e78d
7663
github.com/robfig/cron v0.0.0-20171101201047-2315d5715e36
7764
github.com/sensu/lasr v1.2.1
7865
github.com/shirou/gopsutil v0.0.0-20180801053943-8048a2e9c577
7966
github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
80-
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
81-
github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd // indirect
82-
github.com/sirupsen/logrus v1.2.0
83-
github.com/soheilhy/cmux v0.1.3 // indirect
84-
github.com/spf13/cobra v0.0.3
85-
github.com/spf13/pflag v1.0.3
86-
github.com/spf13/viper v0.0.0-20190408140645-7a605a50e69c
87-
github.com/stretchr/testify v1.2.2
88-
github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 // indirect
67+
github.com/sirupsen/logrus v1.4.2
68+
github.com/spf13/cobra v0.0.5
69+
github.com/spf13/pflag v1.0.5
70+
github.com/spf13/viper v1.4.0
71+
github.com/stretchr/testify v1.4.0
8972
github.com/ulikunitz/xz v0.5.4 // indirect
9073
github.com/whyrusleeping/go-logging v0.0.0-20170515211332-0457bb6b88fc // indirect
9174
github.com/willf/pad v0.0.0-20160331131008-b3d780601022
92-
github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect
9375
go.etcd.io/bbolt v1.3.2
94-
go.uber.org/atomic v1.4.0 // indirect
95-
go.uber.org/multierr v1.1.0 // indirect
96-
go.uber.org/zap v1.10.0 // indirect
97-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
98-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859
99-
golang.org/x/sync v0.0.0-20190423024810-112230192c58 // indirect
100-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
101-
golang.org/x/time v0.0.0-20170927054726-6dc17368e09b
102-
google.golang.org/genproto v0.0.0-20170918111702-1e559d0a00ee // indirect
103-
google.golang.org/grpc v1.13.0
76+
go.uber.org/multierr v1.2.0 // indirect
77+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
78+
golang.org/x/net v0.0.0-20191014212845-da9a3fd4c582
79+
golang.org/x/sys v0.0.0-20191010194322-b09406accb47
80+
golang.org/x/text v0.3.2 // indirect
81+
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
82+
google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 // indirect
83+
google.golang.org/grpc v1.24.0
10484
gopkg.in/AlecAivazis/survey.v1 v1.4.0 // indirect
10585
gopkg.in/h2non/filetype.v1 v1.0.3
10686
gopkg.in/sourcemap.v1 v1.0.5 // indirect
107-
gopkg.in/yaml.v2 v2.2.2
87+
gopkg.in/yaml.v2 v2.2.4
10888
gotest.tools v2.2.0+incompatible // indirect
89+
sigs.k8s.io/yaml v1.1.0 // indirect
10990
)

0 commit comments

Comments
 (0)