kubernetes
/
kubelet
mirror of https://github.com/kubernetes/kubelet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93812 from liggitt/json-patch-4.8.0-1.17 

[1.17] Update to json-patch 4.8.0

Kubernetes-commit: da707e8b3e96e2f5d91ed474c16c5edde7192bf2
This commit is contained in:
Kubernetes Publisher 2020-08-11 23:57:45 -07:00
parent a99d19c3cc
commit 72fcea88ac
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Godeps/Godeps.json generated
View File

@ -48,7 +48,7 @@
},
{
"ImportPath": "github.com/evanphx/json-patch",
"Rev": "v4.2.0"
"Rev": "162e5629780b"
},
{
"ImportPath": "github.com/fsnotify/fsnotify",
@ -122,6 +122,10 @@
"ImportPath": "github.com/hpcloud/tail",
"Rev": "v1.0.0"
},
{
"ImportPath": "github.com/jessevdk/go-flags",
"Rev": "v1.4.0"
},
{
"ImportPath": "github.com/json-iterator/go",
"Rev": "v1.1.8"
@ -174,6 +178,10 @@
"ImportPath": "github.com/onsi/gomega",
"Rev": "v1.7.0"
},
{
"ImportPath": "github.com/pkg/errors",
"Rev": "v0.8.1"
},
{
"ImportPath": "github.com/pmezard/go-difflib",
"Rev": "v1.0.0"
@ -268,11 +276,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "41c764546815"
"Rev": "eccf1e78d6cc"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "891b87d7c4bb"
"Rev": "0d585d148f6f"
},
{
"ImportPath": "k8s.io/gengo",

9
go.mod
View File

@ -9,14 +9,13 @@ require (
golang.org/x/net v0.0.0-20191004110552-13f9640d40b9
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 // indirect
google.golang.org/grpc v1.23.1
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/api v0.0.0-20200812091505-eccf1e78d6cc
k8s.io/apimachinery v0.0.0-20200812091329-0d585d148f6f
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/kubelet => ../kubelet
k8s.io/api => k8s.io/api v0.0.0-20200812091505-eccf1e78d6cc
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200812091329-0d585d148f6f
)

2
go.sum
View File

@ -120,6 +120,8 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20200812091505-eccf1e78d6cc/go.mod h1:zL6P9z+iLEyWARjxviNQD2Tn4yHkzh+VTKDaGJ36kfc=
k8s.io/apimachinery v0.0.0-20200812091329-0d585d148f6f/go.mod h1:q+iFxLyaMeWIBhSlQ4OMkvdwbwrb8Ux0ALl90XD9paU=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=