Skip to content

Commit 6d570c9

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#129633 from skitt/revert-go-difflib-go-spew
Revert to go-difflib and go-spew releases
2 parents ec2e0de + 3986472 commit 6d570c9

File tree

59 files changed

+117
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+117
-174
lines changed

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ require (
5252
github.com/opencontainers/runc v1.2.1
5353
github.com/opencontainers/selinux v1.11.1
5454
github.com/pkg/errors v0.9.1
55-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
55+
github.com/pmezard/go-difflib v1.0.0
5656
github.com/prometheus/client_golang v1.19.1
5757
github.com/prometheus/client_model v0.6.1
5858
github.com/prometheus/common v0.55.0
@@ -141,7 +141,7 @@ require (
141141
github.com/containerd/ttrpc v1.2.5 // indirect
142142
github.com/coredns/caddy v1.1.1 // indirect
143143
github.com/coreos/go-semver v0.3.1 // indirect
144-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
144+
github.com/davecgh/go-spew v1.1.1 // indirect
145145
github.com/dustin/go-humanize v1.0.1 // indirect
146146
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
147147
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect

‎go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,8 @@ github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr
207207
github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8=
208208
github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM=
209209
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
210+
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
210211
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
211-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
212-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
213212
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
214213
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
215214
github.com/docker/docker v26.1.4+incompatible h1:vuTpXDuoga+Z38m1OZHzl7NKisKWaWlhjQk7IDPSLsU=
@@ -408,9 +407,8 @@ github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR
408407
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
409408
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
410409
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
410+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
411411
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
412-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
413-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
414412
github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8cTqKc=
415413
github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
416414
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=

‎staging/src/k8s.io/api/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
)
1515

1616
require (
17-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
17+
github.com/davecgh/go-spew v1.1.1 // indirect
1818
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
1919
github.com/go-logr/logr v1.4.2 // indirect
2020
github.com/google/go-cmp v0.6.0 // indirect

‎staging/src/k8s.io/api/go.sum‎

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5252
github.com/coreos/go-semver v0.3.1 // indirect
5353
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
54-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
54+
github.com/davecgh/go-spew v1.1.1 // indirect
5555
github.com/dustin/go-humanize v1.0.1 // indirect
5656
github.com/felixge/httpsnoop v1.0.4 // indirect
5757
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -79,7 +79,7 @@ require (
7979
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8080
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8181
github.com/pkg/errors v0.9.1 // indirect
82-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
82+
github.com/pmezard/go-difflib v1.0.0 // indirect
8383
github.com/prometheus/client_golang v1.19.1 // indirect
8484
github.com/prometheus/client_model v0.6.1 // indirect
8585
github.com/prometheus/common v0.55.0 // indirect

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

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

‎staging/src/k8s.io/apimachinery/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ godebug winsymlink=0
1010

1111
require (
1212
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
13-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
13+
github.com/davecgh/go-spew v1.1.1
1414
github.com/fxamacker/cbor/v2 v2.7.0
1515
github.com/gogo/protobuf v1.3.2
1616
github.com/google/gnostic-models v0.6.9
@@ -48,7 +48,7 @@ require (
4848
github.com/modern-go/reflect2 v1.0.2 // indirect
4949
github.com/onsi/gomega v1.35.1 // indirect
5050
github.com/pkg/errors v0.9.1 // indirect
51-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
51+
github.com/pmezard/go-difflib v1.0.0 // indirect
5252
github.com/x448/float16 v0.8.4 // indirect
5353
golang.org/x/sys v0.28.0 // indirect
5454
golang.org/x/text v0.21.0 // indirect

‎staging/src/k8s.io/apimachinery/go.sum‎

Lines changed: 2 additions & 4 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ require (
7373
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7474
github.com/cespare/xxhash/v2 v2.3.0 // indirect
7575
github.com/coreos/go-semver v0.3.1 // indirect
76-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
76+
github.com/davecgh/go-spew v1.1.1 // indirect
7777
github.com/dustin/go-humanize v1.0.1 // indirect
7878
github.com/felixge/httpsnoop v1.0.4 // indirect
7979
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -95,7 +95,7 @@ require (
9595
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9696
github.com/modern-go/reflect2 v1.0.2 // indirect
9797
github.com/pkg/errors v0.9.1 // indirect
98-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
98+
github.com/pmezard/go-difflib v1.0.0 // indirect
9999
github.com/pquerna/cachecontrol v0.1.0 // indirect
100100
github.com/prometheus/client_golang v1.19.1 // indirect
101101
github.com/prometheus/client_model v0.6.1 // indirect

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

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

0 commit comments

Comments
 (0)