Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package etcd for openSUSE:Factory checked in
at 2022-07-18 18:34:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/etcd (Old)
and /work/SRC/openSUSE:Factory/.etcd.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "etcd"
Mon Jul 18 18:34:04 2022 rev:33 rq:989817 version:3.5.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/etcd/etcd.changes 2022-05-01
18:53:42.903170000 +0200
+++ /work/SRC/openSUSE:Factory/.etcd.new.1523/etcd.changes 2022-07-18
18:34:14.765783829 +0200
@@ -1,0 +2,9 @@
+Mon Jul 18 05:47:16 UTC 2022 - dmuel...@suse.com
+
+- Update to version 3.5.4:
+ * version: bump up to 3.5.4
+ * Update conssitent_index when applying fails
+ * Add unit test for canonical SRV records
+ * Revert "trim the suffix dot from the srv.Target for etcd-client DNS lookup"
+
+-------------------------------------------------------------------
Old:
----
etcd-3.5.3.tar.gz
New:
----
etcd-3.5.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ etcd.spec ++++++
--- /var/tmp/diff_new_pack.8qZo0o/_old 2022-07-18 18:34:15.657785097 +0200
+++ /var/tmp/diff_new_pack.8qZo0o/_new 2022-07-18 18:34:15.661785103 +0200
@@ -22,7 +22,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: etcd
-Version: 3.5.3
+Version: 3.5.4
Release: 0
Summary: Highly-available key value store for configuration and service
discovery
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.8qZo0o/_old 2022-07-18 18:34:15.701785160 +0200
+++ /var/tmp/diff_new_pack.8qZo0o/_new 2022-07-18 18:34:15.701785160 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/etcd-io/etcd.git</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">v3.5.3</param>
+ <param name="revision">v3.5.4</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">enable</param>
<param name="versionrewrite-pattern">v(.*)</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.8qZo0o/_old 2022-07-18 18:34:15.721785188 +0200
+++ /var/tmp/diff_new_pack.8qZo0o/_new 2022-07-18 18:34:15.725785194 +0200
@@ -5,6 +5,6 @@
<param name="url">git://github.com/etcd-io/etcd.git</param>
<param
name="changesrevision">99018a77bea9a9d29962e5169876c64e02739c52</param></service><service
name="tar_scm">
<param name="url">https://github.com/etcd-io/etcd.git</param>
- <param
name="changesrevision">0452feec719fa8ad88ae343e66e9bb222965d75d</param></service></servicedata>
+ <param
name="changesrevision">08407ff7600eb16c4445d5f21c4fafaf19412e24</param></service></servicedata>
(No newline at EOF)
++++++ etcd-3.5.3.tar.gz -> etcd-3.5.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/api/version/version.go
new/etcd-3.5.4/api/version/version.go
--- old/etcd-3.5.3/api/version/version.go 2022-04-13 17:17:51.000000000
+0200
+++ new/etcd-3.5.4/api/version/version.go 2022-04-24 12:44:36.000000000
+0200
@@ -26,7 +26,7 @@
var (
// MinClusterVersion is the min cluster version this etcd binary is
compatible with.
MinClusterVersion = "3.0.0"
- Version = "3.5.3"
+ Version = "3.5.4"
APIVersion = "unknown"
// Git SHA Value will be set during build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/client/pkg/srv/srv.go
new/etcd-3.5.4/client/pkg/srv/srv.go
--- old/etcd-3.5.3/client/pkg/srv/srv.go 2022-04-13 17:17:51.000000000
+0200
+++ new/etcd-3.5.4/client/pkg/srv/srv.go 2022-04-24 12:44:36.000000000
+0200
@@ -106,10 +106,9 @@
return err
}
for _, srv := range addrs {
- shortHost := strings.TrimSuffix(srv.Target, ".")
urls = append(urls, &url.URL{
Scheme: scheme,
- Host: net.JoinHostPort(shortHost,
fmt.Sprintf("%d", srv.Port)),
+ Host: net.JoinHostPort(srv.Target,
fmt.Sprintf("%d", srv.Port)),
})
}
srvs = append(srvs, addrs...)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/client/pkg/srv/srv_test.go
new/etcd-3.5.4/client/pkg/srv/srv_test.go
--- old/etcd-3.5.3/client/pkg/srv/srv_test.go 2022-04-13 17:17:51.000000000
+0200
+++ new/etcd-3.5.4/client/pkg/srv/srv_test.go 2022-04-24 12:44:36.000000000
+0200
@@ -226,12 +226,12 @@
},
{
[]*net.SRV{
- {Target: "a.example.com.", Port: 2480},
- {Target: "b.example.com.", Port: 2480},
- {Target: "c.example.com", Port: 2480},
+ {Target: "a.example.com", Port: 2480},
+ {Target: "b.example.com", Port: 2480},
+ {Target: "c.example.com.", Port: 2480},
},
[]*net.SRV{},
- []string{"https://a.example.com:2480";,
"https://b.example.com:2480";, "https://c.example.com:2480"},
+ []string{"https://a.example.com:2480";,
"https://b.example.com:2480";, "https://c.example.com.:2480"},
false,
},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/client/v2/go.mod
new/etcd-3.5.4/client/v2/go.mod
--- old/etcd-3.5.3/client/v2/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/client/v2/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -5,8 +5,8 @@
require (
github.com/json-iterator/go v1.1.11
github.com/modern-go/reflect2 v1.0.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
replace (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/client/v3/go.mod
new/etcd-3.5.4/client/v3/go.mod
--- old/etcd-3.5.3/client/v3/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/client/v3/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -6,8 +6,8 @@
github.com/dustin/go-humanize v1.0.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/prometheus/client_golang v1.11.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
go.uber.org/zap v1.17.0
google.golang.org/grpc v1.38.0
sigs.k8s.io/yaml v1.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/etcdctl/go.mod
new/etcd-3.5.4/etcdctl/go.mod
--- old/etcd-3.5.3/etcdctl/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/etcdctl/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -9,12 +9,12 @@
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/urfave/cli v1.22.4
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
- go.etcd.io/etcd/client/v2 v2.305.3
- go.etcd.io/etcd/client/v3 v3.5.3
- go.etcd.io/etcd/etcdutl/v3 v3.5.3
- go.etcd.io/etcd/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
+ go.etcd.io/etcd/client/v2 v2.305.4
+ go.etcd.io/etcd/client/v3 v3.5.4
+ go.etcd.io/etcd/etcdutl/v3 v3.5.4
+ go.etcd.io/etcd/pkg/v3 v3.5.4
go.uber.org/zap v1.17.0
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
google.golang.org/grpc v1.38.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/etcdutl/go.mod
new/etcd-3.5.4/etcdutl/go.mod
--- old/etcd-3.5.3/etcdutl/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/etcdutl/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -25,11 +25,11 @@
github.com/olekukonko/tablewriter v0.0.5
github.com/spf13/cobra v1.1.3
go.etcd.io/bbolt v1.3.6
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
- go.etcd.io/etcd/client/v3 v3.5.3
- go.etcd.io/etcd/pkg/v3 v3.5.3
- go.etcd.io/etcd/raft/v3 v3.5.3
- go.etcd.io/etcd/server/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
+ go.etcd.io/etcd/client/v3 v3.5.4
+ go.etcd.io/etcd/pkg/v3 v3.5.4
+ go.etcd.io/etcd/raft/v3 v3.5.4
+ go.etcd.io/etcd/server/v3 v3.5.4
go.uber.org/zap v1.17.0
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/go.mod new/etcd-3.5.4/go.mod
--- old/etcd-3.5.3/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -20,16 +20,16 @@
github.com/dustin/go-humanize v1.0.0
github.com/spf13/cobra v1.1.3
go.etcd.io/bbolt v1.3.6
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
- go.etcd.io/etcd/client/v2 v2.305.3
- go.etcd.io/etcd/client/v3 v3.5.3
- go.etcd.io/etcd/etcdctl/v3 v3.5.3
- go.etcd.io/etcd/etcdutl/v3 v3.5.3
- go.etcd.io/etcd/pkg/v3 v3.5.3
- go.etcd.io/etcd/raft/v3 v3.5.3
- go.etcd.io/etcd/server/v3 v3.5.3
- go.etcd.io/etcd/tests/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
+ go.etcd.io/etcd/client/v2 v2.305.4
+ go.etcd.io/etcd/client/v3 v3.5.4
+ go.etcd.io/etcd/etcdctl/v3 v3.5.4
+ go.etcd.io/etcd/etcdutl/v3 v3.5.4
+ go.etcd.io/etcd/pkg/v3 v3.5.4
+ go.etcd.io/etcd/raft/v3 v3.5.4
+ go.etcd.io/etcd/server/v3 v3.5.4
+ go.etcd.io/etcd/tests/v3 v3.5.4
go.uber.org/zap v1.17.0
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
google.golang.org/grpc v1.38.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/pkg/go.mod new/etcd-3.5.4/pkg/go.mod
--- old/etcd-3.5.3/pkg/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/pkg/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -9,7 +9,7 @@
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
go.uber.org/zap v1.17.0
google.golang.org/grpc v1.38.0
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/raft/go.mod new/etcd-3.5.4/raft/go.mod
--- old/etcd-3.5.3/raft/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/raft/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -8,7 +8,7 @@
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/pkg/errors v0.9.1 // indirect
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
// Bad imports are sometimes causing attempts to pull that code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/server/etcdserver/server.go
new/etcd-3.5.4/server/etcdserver/server.go
--- old/etcd-3.5.3/server/etcdserver/server.go 2022-04-13 17:17:51.000000000
+0200
+++ new/etcd-3.5.4/server/etcdserver/server.go 2022-04-24 12:44:36.000000000
+0200
@@ -2167,18 +2167,19 @@
func (s *EtcdServer) applyEntryNormal(e *raftpb.Entry) {
shouldApplyV3 := membership.ApplyV2storeOnly
applyV3Performed := false
- defer func() {
- // The txPostLock callback will not get called in this case,
- // so we should set the consistent index directly.
- if s.consistIndex != nil && !applyV3Performed &&
membership.ApplyBoth == shouldApplyV3 {
- s.consistIndex.SetConsistentIndex(e.Index, e.Term)
- }
- }()
+ var ar *applyResult
index := s.consistIndex.ConsistentIndex()
if e.Index > index {
// set the consistent index of current executing entry
s.consistIndex.SetConsistentApplyingIndex(e.Index, e.Term)
shouldApplyV3 = membership.ApplyBoth
+ defer func() {
+ // The txPostLockInsideApplyHook will not get called in
some cases,
+ // in which we should move the consistent index forward
directly.
+ if !applyV3Performed || (ar != nil && ar.err != nil) {
+ s.consistIndex.SetConsistentIndex(e.Index,
e.Term)
+ }
+ }()
}
s.lg.Debug("apply entry normal",
zap.Uint64("consistent-index", index),
@@ -2220,7 +2221,6 @@
id = raftReq.Header.ID
}
- var ar *applyResult
needResult := s.w.IsRegistered(id)
if needResult || !noSideEffect(&raftReq) {
if !needResult && raftReq.Txn != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/server/go.mod new/etcd-3.5.4/server/go.mod
--- old/etcd-3.5.3/server/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/server/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -25,12 +25,12 @@
github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
go.etcd.io/bbolt v1.3.6
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
- go.etcd.io/etcd/client/v2 v2.305.3
- go.etcd.io/etcd/client/v3 v3.5.3
- go.etcd.io/etcd/pkg/v3 v3.5.3
- go.etcd.io/etcd/raft/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
+ go.etcd.io/etcd/client/v2 v2.305.4
+ go.etcd.io/etcd/client/v3 v3.5.4
+ go.etcd.io/etcd/pkg/v3 v3.5.4
+ go.etcd.io/etcd/raft/v3 v3.5.4
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc
v0.20.0
go.opentelemetry.io/otel v0.20.0
go.opentelemetry.io/otel/exporters/otlp v0.20.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/tests/go.mod new/etcd-3.5.4/tests/go.mod
--- old/etcd-3.5.3/tests/go.mod 2022-04-13 17:17:51.000000000 +0200
+++ new/etcd-3.5.4/tests/go.mod 2022-04-24 12:44:36.000000000 +0200
@@ -28,14 +28,14 @@
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
go.etcd.io/bbolt v1.3.6
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
- go.etcd.io/etcd/client/v2 v2.305.3
- go.etcd.io/etcd/client/v3 v3.5.3
- go.etcd.io/etcd/etcdutl/v3 v3.5.3
- go.etcd.io/etcd/pkg/v3 v3.5.3
- go.etcd.io/etcd/raft/v3 v3.5.3
- go.etcd.io/etcd/server/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
+ go.etcd.io/etcd/client/v2 v2.305.4
+ go.etcd.io/etcd/client/v3 v3.5.4
+ go.etcd.io/etcd/etcdutl/v3 v3.5.4
+ go.etcd.io/etcd/pkg/v3 v3.5.4
+ go.etcd.io/etcd/raft/v3 v3.5.4
+ go.etcd.io/etcd/server/v3 v3.5.4
go.uber.org/zap v1.17.0
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etcd-3.5.3/tests/integration/v3_auth_test.go
new/etcd-3.5.4/tests/integration/v3_auth_test.go
--- old/etcd-3.5.3/tests/integration/v3_auth_test.go 2022-04-13
17:17:51.000000000 +0200
+++ new/etcd-3.5.4/tests/integration/v3_auth_test.go 2022-04-24
12:44:36.000000000 +0200
@@ -46,6 +46,33 @@
}
}
+// TestV3AuthEmptyUserPut ensures that a put with an empty user will return an
empty user error,
+// and the consistent_index should be moved forward even the apply-->Put fails.
+func TestV3AuthEmptyUserPut(t *testing.T) {
+ BeforeTest(t)
+ clus := NewClusterV3(t, &ClusterConfig{
+ Size: 1,
+ SnapshotCount: 3,
+ })
+ defer clus.Terminate(t)
+
+ ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second)
+ defer cancel()
+
+ api := toGRPC(clus.Client(0))
+ authSetupRoot(t, api.Auth)
+
+ // The SnapshotCount is 3, so there must be at least 3 new snapshot
files being created.
+ // The VERIFY logic will check whether the consistent_index >= last
snapshot index on
+ // cluster terminating.
+ for i := 0; i < 10; i++ {
+ _, err := api.KV.Put(ctx, &pb.PutRequest{Key: []byte("foo"),
Value: []byte("bar")})
+ if !eqErrGRPC(err, rpctypes.ErrUserEmpty) {
+ t.Fatalf("got %v, expected %v", err,
rpctypes.ErrUserEmpty)
+ }
+ }
+}
+
// TestV3AuthTokenWithDisable tests that auth won't crash if
// given a valid token when authentication is disabled
func TestV3AuthTokenWithDisable(t *testing.T) {
++++++ vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdctl/vendor/go.etcd.io/etcd/api/v3/version/version.go
new/vendor/etcdctl/vendor/go.etcd.io/etcd/api/v3/version/version.go
--- old/vendor/etcdctl/vendor/go.etcd.io/etcd/api/v3/version/version.go
2022-04-20 15:19:25.714198771 +0200
+++ new/vendor/etcdctl/vendor/go.etcd.io/etcd/api/v3/version/version.go
2022-07-18 07:49:07.551042098 +0200
@@ -26,7 +26,7 @@
var (
// MinClusterVersion is the min cluster version this etcd binary is
compatible with.
MinClusterVersion = "3.0.0"
- Version = "3.5.3"
+ Version = "3.5.4"
APIVersion = "unknown"
// Git SHA Value will be set during build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdctl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
new/vendor/etcdctl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
--- old/vendor/etcdctl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
2022-04-20 15:19:25.722198727 +0200
+++ new/vendor/etcdctl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
2022-07-18 07:49:07.551042098 +0200
@@ -106,10 +106,9 @@
return err
}
for _, srv := range addrs {
- shortHost := strings.TrimSuffix(srv.Target, ".")
urls = append(urls, &url.URL{
Scheme: scheme,
- Host: net.JoinHostPort(shortHost,
fmt.Sprintf("%d", srv.Port)),
+ Host: net.JoinHostPort(srv.Target,
fmt.Sprintf("%d", srv.Port)),
})
}
srvs = append(srvs, addrs...)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v2/go.mod
new/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v2/go.mod
--- old/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v2/go.mod 2022-04-20
15:19:25.754198556 +0200
+++ new/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v2/go.mod 2022-07-18
07:49:07.555042185 +0200
@@ -5,8 +5,8 @@
require (
github.com/json-iterator/go v1.1.11
github.com/modern-go/reflect2 v1.0.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
replace (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v3/go.mod
new/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v3/go.mod
--- old/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v3/go.mod 2022-04-20
15:19:25.758198535 +0200
+++ new/vendor/etcdctl/vendor/go.etcd.io/etcd/client/v3/go.mod 2022-07-18
07:49:07.555042185 +0200
@@ -6,8 +6,8 @@
github.com/dustin/go-humanize v1.0.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/prometheus/client_golang v1.11.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
go.uber.org/zap v1.17.0
google.golang.org/grpc v1.38.0
sigs.k8s.io/yaml v1.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/etcdctl/vendor/go.etcd.io/etcd/raft/v3/go.mod
new/vendor/etcdctl/vendor/go.etcd.io/etcd/raft/v3/go.mod
--- old/vendor/etcdctl/vendor/go.etcd.io/etcd/raft/v3/go.mod 2022-04-20
15:19:25.786198384 +0200
+++ new/vendor/etcdctl/vendor/go.etcd.io/etcd/raft/v3/go.mod 2022-07-18
07:49:07.559042272 +0200
@@ -8,7 +8,7 @@
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/pkg/errors v0.9.1 // indirect
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
// Bad imports are sometimes causing attempts to pull that code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdctl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
new/vendor/etcdctl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
--- old/vendor/etcdctl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
2022-04-20 15:19:27.106191304 +0200
+++ new/vendor/etcdctl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
2022-07-18 07:49:07.563042360 +0200
@@ -2167,18 +2167,19 @@
func (s *EtcdServer) applyEntryNormal(e *raftpb.Entry) {
shouldApplyV3 := membership.ApplyV2storeOnly
applyV3Performed := false
- defer func() {
- // The txPostLock callback will not get called in this case,
- // so we should set the consistent index directly.
- if s.consistIndex != nil && !applyV3Performed &&
membership.ApplyBoth == shouldApplyV3 {
- s.consistIndex.SetConsistentIndex(e.Index, e.Term)
- }
- }()
+ var ar *applyResult
index := s.consistIndex.ConsistentIndex()
if e.Index > index {
// set the consistent index of current executing entry
s.consistIndex.SetConsistentApplyingIndex(e.Index, e.Term)
shouldApplyV3 = membership.ApplyBoth
+ defer func() {
+ // The txPostLockInsideApplyHook will not get called in
some cases,
+ // in which we should move the consistent index forward
directly.
+ if !applyV3Performed || (ar != nil && ar.err != nil) {
+ s.consistIndex.SetConsistentIndex(e.Index,
e.Term)
+ }
+ }()
}
s.lg.Debug("apply entry normal",
zap.Uint64("consistent-index", index),
@@ -2220,7 +2221,6 @@
id = raftReq.Header.ID
}
- var ar *applyResult
needResult := s.w.IsRegistered(id)
if needResult || !noSideEffect(&raftReq) {
if !needResult && raftReq.Txn != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/etcdctl/vendor/modules.txt
new/vendor/etcdctl/vendor/modules.txt
--- old/vendor/etcdctl/vendor/modules.txt 2022-04-20 15:19:27.626188512
+0200
+++ new/vendor/etcdctl/vendor/modules.txt 2022-07-18 07:49:07.479040530
+0200
@@ -75,7 +75,7 @@
github.com/xiang90/probing
# go.etcd.io/bbolt v1.3.6
go.etcd.io/bbolt
-# go.etcd.io/etcd/api/v3 v3.5.3 => ../api
+# go.etcd.io/etcd/api/v3 v3.5.4 => ../api
## explicit
go.etcd.io/etcd/api/v3/authpb
go.etcd.io/etcd/api/v3/etcdserverpb
@@ -83,7 +83,7 @@
go.etcd.io/etcd/api/v3/mvccpb
go.etcd.io/etcd/api/v3/v3rpc/rpctypes
go.etcd.io/etcd/api/v3/version
-# go.etcd.io/etcd/client/pkg/v3 v3.5.3 => ../client/pkg
+# go.etcd.io/etcd/client/pkg/v3 v3.5.4 => ../client/pkg
## explicit
go.etcd.io/etcd/client/pkg/v3/fileutil
go.etcd.io/etcd/client/pkg/v3/logutil
@@ -93,10 +93,10 @@
go.etcd.io/etcd/client/pkg/v3/tlsutil
go.etcd.io/etcd/client/pkg/v3/transport
go.etcd.io/etcd/client/pkg/v3/types
-# go.etcd.io/etcd/client/v2 v2.305.3 => ../client/v2
+# go.etcd.io/etcd/client/v2 v2.305.4 => ../client/v2
## explicit
go.etcd.io/etcd/client/v2
-# go.etcd.io/etcd/client/v3 v3.5.3 => ../client/v3
+# go.etcd.io/etcd/client/v3 v3.5.4 => ../client/v3
## explicit
go.etcd.io/etcd/client/v3
go.etcd.io/etcd/client/v3/concurrency
@@ -105,11 +105,11 @@
go.etcd.io/etcd/client/v3/internal/resolver
go.etcd.io/etcd/client/v3/mirror
go.etcd.io/etcd/client/v3/snapshot
-# go.etcd.io/etcd/etcdutl/v3 v3.5.3 => ../etcdutl
+# go.etcd.io/etcd/etcdutl/v3 v3.5.4 => ../etcdutl
## explicit
go.etcd.io/etcd/etcdutl/v3/etcdutl
go.etcd.io/etcd/etcdutl/v3/snapshot
-# go.etcd.io/etcd/pkg/v3 v3.5.3 => ../pkg
+# go.etcd.io/etcd/pkg/v3 v3.5.4 => ../pkg
## explicit
go.etcd.io/etcd/pkg/v3/adt
go.etcd.io/etcd/pkg/v3/cobrautl
@@ -127,13 +127,13 @@
go.etcd.io/etcd/pkg/v3/schedule
go.etcd.io/etcd/pkg/v3/traceutil
go.etcd.io/etcd/pkg/v3/wait
-# go.etcd.io/etcd/raft/v3 v3.5.3 => ../raft
+# go.etcd.io/etcd/raft/v3 v3.5.4 => ../raft
go.etcd.io/etcd/raft/v3
go.etcd.io/etcd/raft/v3/confchange
go.etcd.io/etcd/raft/v3/quorum
go.etcd.io/etcd/raft/v3/raftpb
go.etcd.io/etcd/raft/v3/tracker
-# go.etcd.io/etcd/server/v3 v3.5.3 => ../server
+# go.etcd.io/etcd/server/v3 v3.5.4 => ../server
go.etcd.io/etcd/server/v3/auth
go.etcd.io/etcd/server/v3/config
go.etcd.io/etcd/server/v3/datadir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdutl/vendor/go.etcd.io/etcd/api/v3/version/version.go
new/vendor/etcdutl/vendor/go.etcd.io/etcd/api/v3/version/version.go
--- old/vendor/etcdutl/vendor/go.etcd.io/etcd/api/v3/version/version.go
2022-04-20 15:19:25.714198771 +0200
+++ new/vendor/etcdutl/vendor/go.etcd.io/etcd/api/v3/version/version.go
2022-07-18 07:49:07.551042098 +0200
@@ -26,7 +26,7 @@
var (
// MinClusterVersion is the min cluster version this etcd binary is
compatible with.
MinClusterVersion = "3.0.0"
- Version = "3.5.3"
+ Version = "3.5.4"
APIVersion = "unknown"
// Git SHA Value will be set during build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdutl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
new/vendor/etcdutl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
--- old/vendor/etcdutl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
2022-04-20 15:19:25.722198727 +0200
+++ new/vendor/etcdutl/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
2022-07-18 07:49:07.551042098 +0200
@@ -106,10 +106,9 @@
return err
}
for _, srv := range addrs {
- shortHost := strings.TrimSuffix(srv.Target, ".")
urls = append(urls, &url.URL{
Scheme: scheme,
- Host: net.JoinHostPort(shortHost,
fmt.Sprintf("%d", srv.Port)),
+ Host: net.JoinHostPort(srv.Target,
fmt.Sprintf("%d", srv.Port)),
})
}
srvs = append(srvs, addrs...)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v2/go.mod
new/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v2/go.mod
--- old/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v2/go.mod 2022-04-20
15:19:25.754198556 +0200
+++ new/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v2/go.mod 2022-07-18
07:49:07.555042185 +0200
@@ -5,8 +5,8 @@
require (
github.com/json-iterator/go v1.1.11
github.com/modern-go/reflect2 v1.0.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
replace (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v3/go.mod
new/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v3/go.mod
--- old/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v3/go.mod 2022-04-20
15:19:25.758198535 +0200
+++ new/vendor/etcdutl/vendor/go.etcd.io/etcd/client/v3/go.mod 2022-07-18
07:49:07.555042185 +0200
@@ -6,8 +6,8 @@
github.com/dustin/go-humanize v1.0.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/prometheus/client_golang v1.11.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
go.uber.org/zap v1.17.0
google.golang.org/grpc v1.38.0
sigs.k8s.io/yaml v1.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/etcdutl/vendor/go.etcd.io/etcd/raft/v3/go.mod
new/vendor/etcdutl/vendor/go.etcd.io/etcd/raft/v3/go.mod
--- old/vendor/etcdutl/vendor/go.etcd.io/etcd/raft/v3/go.mod 2022-04-20
15:19:25.786198384 +0200
+++ new/vendor/etcdutl/vendor/go.etcd.io/etcd/raft/v3/go.mod 2022-07-18
07:49:07.559042272 +0200
@@ -8,7 +8,7 @@
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/pkg/errors v0.9.1 // indirect
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
// Bad imports are sometimes causing attempts to pull that code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/etcdutl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
new/vendor/etcdutl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
--- old/vendor/etcdutl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
2022-04-20 15:19:27.106191304 +0200
+++ new/vendor/etcdutl/vendor/go.etcd.io/etcd/server/v3/etcdserver/server.go
2022-07-18 07:49:07.563042360 +0200
@@ -2167,18 +2167,19 @@
func (s *EtcdServer) applyEntryNormal(e *raftpb.Entry) {
shouldApplyV3 := membership.ApplyV2storeOnly
applyV3Performed := false
- defer func() {
- // The txPostLock callback will not get called in this case,
- // so we should set the consistent index directly.
- if s.consistIndex != nil && !applyV3Performed &&
membership.ApplyBoth == shouldApplyV3 {
- s.consistIndex.SetConsistentIndex(e.Index, e.Term)
- }
- }()
+ var ar *applyResult
index := s.consistIndex.ConsistentIndex()
if e.Index > index {
// set the consistent index of current executing entry
s.consistIndex.SetConsistentApplyingIndex(e.Index, e.Term)
shouldApplyV3 = membership.ApplyBoth
+ defer func() {
+ // The txPostLockInsideApplyHook will not get called in
some cases,
+ // in which we should move the consistent index forward
directly.
+ if !applyV3Performed || (ar != nil && ar.err != nil) {
+ s.consistIndex.SetConsistentIndex(e.Index,
e.Term)
+ }
+ }()
}
s.lg.Debug("apply entry normal",
zap.Uint64("consistent-index", index),
@@ -2220,7 +2221,6 @@
id = raftReq.Header.ID
}
- var ar *applyResult
needResult := s.w.IsRegistered(id)
if needResult || !noSideEffect(&raftReq) {
if !needResult && raftReq.Txn != nil {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/etcdutl/vendor/modules.txt
new/vendor/etcdutl/vendor/modules.txt
--- old/vendor/etcdutl/vendor/modules.txt 2022-04-20 15:19:29.186180129
+0200
+++ new/vendor/etcdutl/vendor/modules.txt 2022-07-18 07:49:07.627043753
+0200
@@ -63,7 +63,7 @@
# go.etcd.io/bbolt v1.3.6
## explicit
go.etcd.io/bbolt
-# go.etcd.io/etcd/api/v3 v3.5.3 => ../api
+# go.etcd.io/etcd/api/v3 v3.5.4 => ../api
## explicit
go.etcd.io/etcd/api/v3/authpb
go.etcd.io/etcd/api/v3/etcdserverpb
@@ -71,7 +71,7 @@
go.etcd.io/etcd/api/v3/mvccpb
go.etcd.io/etcd/api/v3/v3rpc/rpctypes
go.etcd.io/etcd/api/v3/version
-# go.etcd.io/etcd/client/pkg/v3 v3.5.3 => ../client/pkg
+# go.etcd.io/etcd/client/pkg/v3 v3.5.4 => ../client/pkg
## explicit
go.etcd.io/etcd/client/pkg/v3/fileutil
go.etcd.io/etcd/client/pkg/v3/logutil
@@ -81,16 +81,16 @@
go.etcd.io/etcd/client/pkg/v3/tlsutil
go.etcd.io/etcd/client/pkg/v3/transport
go.etcd.io/etcd/client/pkg/v3/types
-# go.etcd.io/etcd/client/v2 v2.305.3 => ../client/v2
+# go.etcd.io/etcd/client/v2 v2.305.4 => ../client/v2
go.etcd.io/etcd/client/v2
-# go.etcd.io/etcd/client/v3 v3.5.3 => ../client/v3
+# go.etcd.io/etcd/client/v3 v3.5.4 => ../client/v3
## explicit
go.etcd.io/etcd/client/v3
go.etcd.io/etcd/client/v3/credentials
go.etcd.io/etcd/client/v3/internal/endpoint
go.etcd.io/etcd/client/v3/internal/resolver
go.etcd.io/etcd/client/v3/snapshot
-# go.etcd.io/etcd/pkg/v3 v3.5.3 => ../pkg
+# go.etcd.io/etcd/pkg/v3 v3.5.4 => ../pkg
## explicit
go.etcd.io/etcd/pkg/v3/adt
go.etcd.io/etcd/pkg/v3/cobrautl
@@ -106,14 +106,14 @@
go.etcd.io/etcd/pkg/v3/schedule
go.etcd.io/etcd/pkg/v3/traceutil
go.etcd.io/etcd/pkg/v3/wait
-# go.etcd.io/etcd/raft/v3 v3.5.3 => ../raft
+# go.etcd.io/etcd/raft/v3 v3.5.4 => ../raft
## explicit
go.etcd.io/etcd/raft/v3
go.etcd.io/etcd/raft/v3/confchange
go.etcd.io/etcd/raft/v3/quorum
go.etcd.io/etcd/raft/v3/raftpb
go.etcd.io/etcd/raft/v3/tracker
-# go.etcd.io/etcd/server/v3 v3.5.3 => ../server
+# go.etcd.io/etcd/server/v3 v3.5.4 => ../server
## explicit
go.etcd.io/etcd/server/v3/auth
go.etcd.io/etcd/server/v3/config
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/server/vendor/go.etcd.io/etcd/api/v3/version/version.go
new/vendor/server/vendor/go.etcd.io/etcd/api/v3/version/version.go
--- old/vendor/server/vendor/go.etcd.io/etcd/api/v3/version/version.go
2022-04-20 15:19:25.714198771 +0200
+++ new/vendor/server/vendor/go.etcd.io/etcd/api/v3/version/version.go
2022-07-18 07:49:07.551042098 +0200
@@ -26,7 +26,7 @@
var (
// MinClusterVersion is the min cluster version this etcd binary is
compatible with.
MinClusterVersion = "3.0.0"
- Version = "3.5.3"
+ Version = "3.5.4"
APIVersion = "unknown"
// Git SHA Value will be set during build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/server/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
new/vendor/server/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
--- old/vendor/server/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
2022-04-20 15:19:25.722198727 +0200
+++ new/vendor/server/vendor/go.etcd.io/etcd/client/pkg/v3/srv/srv.go
2022-07-18 07:49:07.551042098 +0200
@@ -106,10 +106,9 @@
return err
}
for _, srv := range addrs {
- shortHost := strings.TrimSuffix(srv.Target, ".")
urls = append(urls, &url.URL{
Scheme: scheme,
- Host: net.JoinHostPort(shortHost,
fmt.Sprintf("%d", srv.Port)),
+ Host: net.JoinHostPort(srv.Target,
fmt.Sprintf("%d", srv.Port)),
})
}
srvs = append(srvs, addrs...)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/server/vendor/go.etcd.io/etcd/client/v2/go.mod
new/vendor/server/vendor/go.etcd.io/etcd/client/v2/go.mod
--- old/vendor/server/vendor/go.etcd.io/etcd/client/v2/go.mod 2022-04-20
15:19:25.754198556 +0200
+++ new/vendor/server/vendor/go.etcd.io/etcd/client/v2/go.mod 2022-07-18
07:49:07.555042185 +0200
@@ -5,8 +5,8 @@
require (
github.com/json-iterator/go v1.1.11
github.com/modern-go/reflect2 v1.0.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
replace (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/vendor/server/vendor/go.etcd.io/etcd/client/v3/go.mod
new/vendor/server/vendor/go.etcd.io/etcd/client/v3/go.mod
--- old/vendor/server/vendor/go.etcd.io/etcd/client/v3/go.mod 2022-04-20
15:19:25.758198535 +0200
+++ new/vendor/server/vendor/go.etcd.io/etcd/client/v3/go.mod 2022-07-18
07:49:07.555042185 +0200
@@ -6,8 +6,8 @@
github.com/dustin/go-humanize v1.0.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/prometheus/client_golang v1.11.1
- go.etcd.io/etcd/api/v3 v3.5.3
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/api/v3 v3.5.4
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
go.uber.org/zap v1.17.0
google.golang.org/grpc v1.38.0
sigs.k8s.io/yaml v1.2.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/server/vendor/go.etcd.io/etcd/raft/v3/go.mod
new/vendor/server/vendor/go.etcd.io/etcd/raft/v3/go.mod
--- old/vendor/server/vendor/go.etcd.io/etcd/raft/v3/go.mod 2022-04-20
15:19:25.786198384 +0200
+++ new/vendor/server/vendor/go.etcd.io/etcd/raft/v3/go.mod 2022-07-18
07:49:07.559042272 +0200
@@ -8,7 +8,7 @@
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/pkg/errors v0.9.1 // indirect
- go.etcd.io/etcd/client/pkg/v3 v3.5.3
+ go.etcd.io/etcd/client/pkg/v3 v3.5.4
)
// Bad imports are sometimes causing attempts to pull that code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/server/vendor/modules.txt
new/vendor/server/vendor/modules.txt
--- old/vendor/server/vendor/modules.txt 2022-04-20 15:19:26.214196090
+0200
+++ new/vendor/server/vendor/modules.txt 2022-07-18 07:49:07.323037133
+0200
@@ -108,7 +108,7 @@
# go.etcd.io/bbolt v1.3.6
## explicit
go.etcd.io/bbolt
-# go.etcd.io/etcd/api/v3 v3.5.3 => ../api
+# go.etcd.io/etcd/api/v3 v3.5.4 => ../api
## explicit
go.etcd.io/etcd/api/v3/authpb
go.etcd.io/etcd/api/v3/etcdserverpb
@@ -117,7 +117,7 @@
go.etcd.io/etcd/api/v3/mvccpb
go.etcd.io/etcd/api/v3/v3rpc/rpctypes
go.etcd.io/etcd/api/v3/version
-# go.etcd.io/etcd/client/pkg/v3 v3.5.3 => ../client/pkg
+# go.etcd.io/etcd/client/pkg/v3 v3.5.4 => ../client/pkg
## explicit
go.etcd.io/etcd/client/pkg/v3/fileutil
go.etcd.io/etcd/client/pkg/v3/logutil
@@ -128,10 +128,10 @@
go.etcd.io/etcd/client/pkg/v3/tlsutil
go.etcd.io/etcd/client/pkg/v3/transport
go.etcd.io/etcd/client/pkg/v3/types
-# go.etcd.io/etcd/client/v2 v2.305.3 => ../client/v2
+# go.etcd.io/etcd/client/v2 v2.305.4 => ../client/v2
## explicit
go.etcd.io/etcd/client/v2
-# go.etcd.io/etcd/client/v3 v3.5.3 => ../client/v3
+# go.etcd.io/etcd/client/v3 v3.5.4 => ../client/v3
## explicit
go.etcd.io/etcd/client/v3
go.etcd.io/etcd/client/v3/concurrency
@@ -143,7 +143,7 @@
go.etcd.io/etcd/client/v3/naming/endpoints
go.etcd.io/etcd/client/v3/naming/endpoints/internal
go.etcd.io/etcd/client/v3/ordering
-# go.etcd.io/etcd/pkg/v3 v3.5.3 => ../pkg
+# go.etcd.io/etcd/pkg/v3 v3.5.4 => ../pkg
## explicit
go.etcd.io/etcd/pkg/v3/adt
go.etcd.io/etcd/pkg/v3/contention
@@ -161,7 +161,7 @@
go.etcd.io/etcd/pkg/v3/schedule
go.etcd.io/etcd/pkg/v3/traceutil
go.etcd.io/etcd/pkg/v3/wait
-# go.etcd.io/etcd/raft/v3 v3.5.3 => ../raft
+# go.etcd.io/etcd/raft/v3 v3.5.4 => ../raft
## explicit
go.etcd.io/etcd/raft/v3
go.etcd.io/etcd/raft/v3/confchange
