Skip to content

Commit 81f84d3

Browse files
authored
Merge pull request kubernetes#92069 from tapih/update-json-patch
Update github.com/evanphx/json-patch to e83c0a1c26c884f8ec4fb743f6db9…
2 parents b0638ad + 5b06aaa commit 81f84d3

File tree

34 files changed

+218
-111
lines changed

34 files changed

+218
-111
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/docker/go-units v0.4.0
4343
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153
4444
github.com/emicklei/go-restful v2.9.5+incompatible
45-
github.com/evanphx/json-patch v4.2.0+incompatible
45+
github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8
4646
github.com/fsnotify/fsnotify v1.4.9
4747
github.com/go-bindata/go-bindata v3.1.1+incompatible
4848
github.com/go-openapi/analysis v0.19.5
@@ -238,7 +238,7 @@ replace (
238238
github.com/envoyproxy/go-control-plane => github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473
239239
github.com/envoyproxy/protoc-gen-validate => github.com/envoyproxy/protoc-gen-validate v0.1.0
240240
github.com/euank/go-kmsg-parser => github.com/euank/go-kmsg-parser v2.0.0+incompatible
241-
github.com/evanphx/json-patch => github.com/evanphx/json-patch v4.2.0+incompatible
241+
github.com/evanphx/json-patch => github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8
242242
github.com/exponent-io/jsonpath => github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d
243243
github.com/fatih/camelcase => github.com/fatih/camelcase v1.0.0
244244
github.com/fatih/color => github.com/fatih/color v1.7.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
157157
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
158158
github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY=
159159
github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=
160-
github.com/evanphx/json-patch v4.2.0+incompatible h1:fUDGZCv/7iAN7u0puUVhvKCcsR6vRfwrJatElLBEf0I=
161-
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
160+
github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8 h1:DM7gHzQfHwIj+St8zaPOI6iQEPAxOwIkskvw6s9rDaM=
161+
github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8/go.mod h1:pmLOTb3x90VhIKxsA9yeQG5yfOkkKnkk1h+Ql8NDYDw=
162162
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM=
163163
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4=
164164
github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=

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

Lines changed: 3 additions & 1 deletion
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.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/apimachinery/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/davecgh/go-spew v1.1.1
99
github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96
1010
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153
11-
github.com/evanphx/json-patch v4.2.0+incompatible
11+
github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8
1212
github.com/fsnotify/fsnotify v1.4.9 // indirect
1313
github.com/gogo/protobuf v1.3.1
1414
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7
@@ -23,6 +23,7 @@ require (
2323
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
2424
github.com/onsi/ginkgo v1.11.0 // indirect
2525
github.com/onsi/gomega v1.7.0 // indirect
26+
github.com/pkg/errors v0.9.1 // indirect
2627
github.com/spf13/pflag v1.0.5
2728
github.com/stretchr/testify v1.4.0
2829
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e

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

Lines changed: 5 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
@@ -12,7 +12,7 @@ require (
1212
github.com/davecgh/go-spew v1.1.1
1313
github.com/dustin/go-humanize v1.0.0 // indirect
1414
github.com/emicklei/go-restful v2.9.5+incompatible
15-
github.com/evanphx/json-patch v4.2.0+incompatible
15+
github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8
1616
github.com/go-openapi/jsonreference v0.19.3 // indirect
1717
github.com/go-openapi/spec v0.19.3
1818
github.com/gogo/protobuf v1.3.1

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/cli-runtime/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.13
77
require (
88
github.com/davecgh/go-spew v1.1.1
99
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
10-
github.com/evanphx/json-patch v4.2.0+incompatible
10+
github.com/evanphx/json-patch v0.0.0-20190815234213-e83c0a1c26c8
1111
github.com/go-openapi/jsonreference v0.19.3 // indirect
1212
github.com/go-openapi/spec v0.19.3 // indirect
1313
github.com/googleapis/gnostic v0.4.1

staging/src/k8s.io/cli-runtime/go.sum

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

0 commit comments

Comments
 (0)