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

Merge pull request #70764 from wenjiaswe/automated-cherry-pick-of-#70663-upstream-release-1.12 

Automated cherry pick of #70663: update  godeps for golang.org/x/net/... to

Kubernetes-commit: 6370ab3b63cbeed89bbe38aa7a757005eea9f22d
This commit is contained in:
Kubernetes Publisher 2018-11-28 07:50:36 -08:00
parent 7585de142f c6a0ad2cb8
commit 0465cfd9dc
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Godeps/Godeps.json generated
View File

@ -24,19 +24,19 @@
}, },
{ {
"ImportPath": "golang.org/x/net/http2", "ImportPath": "golang.org/x/net/http2",
"Rev": "1c05540f6879653db88113bc4a2b70aec4bd491f" "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd"
}, },
{ {
"ImportPath": "golang.org/x/net/http2/hpack", "ImportPath": "golang.org/x/net/http2/hpack",
"Rev": "1c05540f6879653db88113bc4a2b70aec4bd491f" "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd"
}, },
{ {
"ImportPath": "golang.org/x/net/idna", "ImportPath": "golang.org/x/net/idna",
"Rev": "1c05540f6879653db88113bc4a2b70aec4bd491f" "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd"
}, },
{ {
"ImportPath": "golang.org/x/net/lex/httplex", "ImportPath": "golang.org/x/net/lex/httplex",
"Rev": "1c05540f6879653db88113bc4a2b70aec4bd491f" "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd"
}, },
{ {
"ImportPath": "golang.org/x/text/secure/bidirule", "ImportPath": "golang.org/x/text/secure/bidirule",
@ -60,103 +60,103 @@
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/api/resource", "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/config", "ImportPath": "k8s.io/apimachinery/pkg/apis/config",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/config/v1alpha1", "ImportPath": "k8s.io/apimachinery/pkg/apis/config/v1alpha1",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion", "ImportPath": "k8s.io/apimachinery/pkg/conversion",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/fields", "ImportPath": "k8s.io/apimachinery/pkg/fields",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/labels", "ImportPath": "k8s.io/apimachinery/pkg/labels",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime", "ImportPath": "k8s.io/apimachinery/pkg/runtime",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/selection", "ImportPath": "k8s.io/apimachinery/pkg/selection",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/types", "ImportPath": "k8s.io/apimachinery/pkg/types",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/errors", "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/intstr", "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/json", "ImportPath": "k8s.io/apimachinery/pkg/util/json",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/naming", "ImportPath": "k8s.io/apimachinery/pkg/util/naming",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/net", "ImportPath": "k8s.io/apimachinery/pkg/util/net",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/runtime", "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/sets", "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation", "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/pkg/watch", "ImportPath": "k8s.io/apimachinery/pkg/watch",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
"Rev": "3b307a310a061fc549c8801bfe72ea3d30948920" "Rev": "49ce2735e5074ffc3f8190c8406cf51a96302dad"
}, },
{ {
"ImportPath": "k8s.io/apiserver/pkg/apis/config", "ImportPath": "k8s.io/apiserver/pkg/apis/config",
"Rev": "6287f470a5b62c40cf4882df1a8ca148fd687cb3" "Rev": "e17da99637d8a36a35704c07be9f4d628c185f83"
}, },
{ {
"ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1", "ImportPath": "k8s.io/apiserver/pkg/apis/config/v1alpha1",
"Rev": "6287f470a5b62c40cf4882df1a8ca148fd687cb3" "Rev": "e17da99637d8a36a35704c07be9f4d628c185f83"
}, },
{ {
"ImportPath": "k8s.io/utils/pointer", "ImportPath": "k8s.io/utils/pointer",