From 2aa1348e6cf4d51f91025c41d41bb7e3b9b9384d Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Tue, 12 Mar 2019 09:16:45 -0400 Subject: [PATCH] Update to go 1.12 version of golang.org/x/net Change-Id: I3f2fa5d7b6811c9eca58992318d19e44ec9131fd --- Godeps/Godeps.json | 38 ++-- Godeps/LICENSES | 109 +++++++++- staging/src/k8s.io/api/Godeps/Godeps.json | 8 +- .../Godeps/Godeps.json | 16 +- .../k8s.io/apimachinery/Godeps/Godeps.json | 14 +- .../src/k8s.io/apiserver/Godeps/Godeps.json | 16 +- .../src/k8s.io/cli-runtime/Godeps/Godeps.json | 10 +- .../src/k8s.io/client-go/Godeps/Godeps.json | 12 +- .../k8s.io/cloud-provider/Godeps/Godeps.json | 10 +- .../cluster-bootstrap/Godeps/Godeps.json | 8 +- .../k8s.io/component-base/Godeps/Godeps.json | 8 +- staging/src/k8s.io/csi-api/Godeps/Godeps.json | 10 +- .../csi-translation-lib/Godeps/Godeps.json | 8 +- .../k8s.io/kube-aggregator/Godeps/Godeps.json | 20 +- .../Godeps/Godeps.json | 8 +- .../src/k8s.io/kube-proxy/Godeps/Godeps.json | 8 +- .../k8s.io/kube-scheduler/Godeps/Godeps.json | 8 +- staging/src/k8s.io/kubelet/Godeps/Godeps.json | 8 +- staging/src/k8s.io/metrics/Godeps/Godeps.json | 10 +- .../src/k8s.io/node-api/Godeps/Godeps.json | 10 +- .../sample-apiserver/Godeps/Godeps.json | 16 +- .../sample-cli-plugin/Godeps/Godeps.json | 10 +- .../sample-controller/Godeps/Godeps.json | 10 +- vendor/golang.org/x/net/context/ctxhttp/BUILD | 6 +- .../x/net/context/ctxhttp/ctxhttp.go | 5 +- .../x/net/context/ctxhttp/ctxhttp_pre17.go | 147 ------------- vendor/golang.org/x/net/html/const.go | 10 +- vendor/golang.org/x/net/html/node.go | 2 +- vendor/golang.org/x/net/html/parse.go | 144 +++++++------ vendor/golang.org/x/net/http2/BUILD | 10 - .../x/net/http2/configure_transport.go | 82 ------- vendor/golang.org/x/net/http2/frame.go | 2 +- vendor/golang.org/x/net/http2/go111.go | 11 +- vendor/golang.org/x/net/http2/go16.go | 16 -- vendor/golang.org/x/net/http2/go17.go | 121 ----------- vendor/golang.org/x/net/http2/go17_not18.go | 36 ---- vendor/golang.org/x/net/http2/go18.go | 56 ----- vendor/golang.org/x/net/http2/go19.go | 16 -- vendor/golang.org/x/net/http2/headermap.go | 20 +- vendor/golang.org/x/net/http2/hpack/hpack.go | 10 +- vendor/golang.org/x/net/http2/http2.go | 17 +- vendor/golang.org/x/net/http2/not_go111.go | 11 +- vendor/golang.org/x/net/http2/not_go16.go | 21 -- vendor/golang.org/x/net/http2/not_go17.go | 95 --------- vendor/golang.org/x/net/http2/not_go18.go | 29 --- vendor/golang.org/x/net/http2/not_go19.go | 16 -- vendor/golang.org/x/net/http2/server.go | 54 ++--- vendor/golang.org/x/net/http2/transport.go | 200 +++++++++++++++--- vendor/golang.org/x/net/http2/write.go | 4 +- .../x/net/internal/nettest/helper_bsd.go | 29 --- .../x/net/internal/nettest/helper_nobsd.go | 6 +- .../x/net/internal/nettest/helper_posix.go | 2 +- .../x/net/internal/nettest/helper_stub.go | 4 - .../x/net/internal/nettest/helper_unix.go | 2 +- .../x/net/internal/nettest/helper_windows.go | 4 - .../x/net/internal/nettest/stack.go | 2 +- .../golang.org/x/net/internal/socks/socks.go | 1 + vendor/golang.org/x/net/proxy/proxy.go | 9 +- vendor/golang.org/x/net/trace/BUILD | 7 +- vendor/golang.org/x/net/trace/trace.go | 27 ++- vendor/golang.org/x/net/trace/trace_go16.go | 21 -- vendor/golang.org/x/net/trace/trace_go17.go | 21 -- 62 files changed, 620 insertions(+), 1031 deletions(-) delete mode 100644 vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go delete mode 100644 vendor/golang.org/x/net/http2/configure_transport.go delete mode 100644 vendor/golang.org/x/net/http2/go16.go delete mode 100644 vendor/golang.org/x/net/http2/go17.go delete mode 100644 vendor/golang.org/x/net/http2/go17_not18.go delete mode 100644 vendor/golang.org/x/net/http2/go18.go delete mode 100644 vendor/golang.org/x/net/http2/go19.go delete mode 100644 vendor/golang.org/x/net/http2/not_go16.go delete mode 100644 vendor/golang.org/x/net/http2/not_go17.go delete mode 100644 vendor/golang.org/x/net/http2/not_go18.go delete mode 100644 vendor/golang.org/x/net/http2/not_go19.go delete mode 100644 vendor/golang.org/x/net/trace/trace_go16.go delete mode 100644 vendor/golang.org/x/net/trace/trace_go17.go diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index afdee0f5de..484696713f 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -3625,67 +3625,67 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/context/ctxhttp", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/html", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/html/atom", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" - }, - { - "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/html/charset", - "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" + }, + { + "ImportPath": "golang.org/x/net/http/httpguts", + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/nettest", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/socks", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/sockstest", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/timeseries", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/proxy", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/trace", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/websocket", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/Godeps/LICENSES b/Godeps/LICENSES index 27f3a33de3..6887574bee 100644 --- a/Godeps/LICENSES +++ b/Godeps/LICENSES @@ -101156,6 +101156,41 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ +================================================================================ += vendor/golang.org/x/net/http/httpguts licensed under: = + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + += vendor/golang.org/x/net/LICENSE 5d4950ecb7b26d2c5e4e7b4e0dd74707 +================================================================================ + + ================================================================================ = vendor/golang.org/x/net/http2 licensed under: = @@ -101262,7 +101297,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -= vendor/golang.org/x/net/internal/timeseries licensed under: = += vendor/golang.org/x/net/internal/nettest licensed under: = Copyright (c) 2009 The Go Authors. All rights reserved. @@ -101297,7 +101332,77 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ================================================================================ -= vendor/golang.org/x/net/lex/httplex licensed under: = += vendor/golang.org/x/net/internal/socks licensed under: = + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + += vendor/golang.org/x/net/LICENSE 5d4950ecb7b26d2c5e4e7b4e0dd74707 +================================================================================ + + +================================================================================ += vendor/golang.org/x/net/internal/sockstest licensed under: = + +Copyright (c) 2009 The Go Authors. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + += vendor/golang.org/x/net/LICENSE 5d4950ecb7b26d2c5e4e7b4e0dd74707 +================================================================================ + + +================================================================================ += vendor/golang.org/x/net/internal/timeseries licensed under: = Copyright (c) 2009 The Go Authors. All rights reserved. diff --git a/staging/src/k8s.io/api/Godeps/Godeps.json b/staging/src/k8s.io/api/Godeps/Godeps.json index c47db3381f..5d47e1239d 100644 --- a/staging/src/k8s.io/api/Godeps/Godeps.json +++ b/staging/src/k8s.io/api/Godeps/Godeps.json @@ -56,19 +56,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json index b0a68e068f..13f3a17793 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json @@ -688,35 +688,35 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/timeseries", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/trace", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/websocket", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json index 227aaa9bac..2b02732f12 100644 --- a/staging/src/k8s.io/apimachinery/Godeps/Godeps.json +++ b/staging/src/k8s.io/apimachinery/Godeps/Godeps.json @@ -120,31 +120,31 @@ }, { "ImportPath": "golang.org/x/net/html", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/html/atom", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/websocket", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/apiserver/Godeps/Godeps.json b/staging/src/k8s.io/apiserver/Godeps/Godeps.json index 62d624797e..49e1dfbeb2 100644 --- a/staging/src/k8s.io/apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/apiserver/Godeps/Godeps.json @@ -696,35 +696,35 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/timeseries", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/trace", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/websocket", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json index 65497cd56d..f541b5f13f 100644 --- a/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json +++ b/staging/src/k8s.io/cli-runtime/Godeps/Godeps.json @@ -168,23 +168,23 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/client-go/Godeps/Godeps.json b/staging/src/k8s.io/client-go/Godeps/Godeps.json index 733c69c7cc..d20ebeca85 100644 --- a/staging/src/k8s.io/client-go/Godeps/Godeps.json +++ b/staging/src/k8s.io/client-go/Godeps/Godeps.json @@ -192,27 +192,27 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/context/ctxhttp", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json index df27f66946..8b51585c0f 100644 --- a/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json +++ b/staging/src/k8s.io/cloud-provider/Godeps/Godeps.json @@ -84,23 +84,23 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json b/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json index 804ee756d4..37a6cf6a03 100644 --- a/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json +++ b/staging/src/k8s.io/cluster-bootstrap/Godeps/Godeps.json @@ -20,19 +20,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/component-base/Godeps/Godeps.json b/staging/src/k8s.io/component-base/Godeps/Godeps.json index a7e9ecbab9..07b29cced4 100644 --- a/staging/src/k8s.io/component-base/Godeps/Godeps.json +++ b/staging/src/k8s.io/component-base/Godeps/Godeps.json @@ -24,19 +24,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/csi-api/Godeps/Godeps.json b/staging/src/k8s.io/csi-api/Godeps/Godeps.json index b616ffd026..e3af59b9d4 100644 --- a/staging/src/k8s.io/csi-api/Godeps/Godeps.json +++ b/staging/src/k8s.io/csi-api/Godeps/Godeps.json @@ -84,23 +84,23 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json b/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json index b88d29a286..c42e95fc2b 100644 --- a/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json +++ b/staging/src/k8s.io/csi-translation-lib/Godeps/Godeps.json @@ -20,19 +20,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json index 9920f63226..6d5f49d7af 100644 --- a/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json @@ -268,43 +268,43 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/html", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/html/atom", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/timeseries", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/trace", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/websocket", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json b/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json index 6c7c3b0386..7b3090ce95 100644 --- a/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-controller-manager/Godeps/Godeps.json @@ -20,19 +20,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json b/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json index e309545c12..bfb50da4e5 100644 --- a/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-proxy/Godeps/Godeps.json @@ -20,19 +20,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json b/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json index 36d5a1e8af..01478fa758 100644 --- a/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json +++ b/staging/src/k8s.io/kube-scheduler/Godeps/Godeps.json @@ -20,19 +20,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/kubelet/Godeps/Godeps.json b/staging/src/k8s.io/kubelet/Godeps/Godeps.json index 13f96897ad..f1803c51be 100644 --- a/staging/src/k8s.io/kubelet/Godeps/Godeps.json +++ b/staging/src/k8s.io/kubelet/Godeps/Godeps.json @@ -20,19 +20,19 @@ }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/text/secure/bidirule", diff --git a/staging/src/k8s.io/metrics/Godeps/Godeps.json b/staging/src/k8s.io/metrics/Godeps/Godeps.json index 9a0ff24c53..05ca8f3077 100644 --- a/staging/src/k8s.io/metrics/Godeps/Godeps.json +++ b/staging/src/k8s.io/metrics/Godeps/Godeps.json @@ -88,23 +88,23 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/node-api/Godeps/Godeps.json b/staging/src/k8s.io/node-api/Godeps/Godeps.json index 5f4681326f..ac7faec06b 100644 --- a/staging/src/k8s.io/node-api/Godeps/Godeps.json +++ b/staging/src/k8s.io/node-api/Godeps/Godeps.json @@ -84,23 +84,23 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json index 1d6c80b326..363f094996 100644 --- a/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json @@ -248,35 +248,35 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/internal/timeseries", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/trace", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/websocket", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json index 938c8f2b88..81a198ba9e 100644 --- a/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-cli-plugin/Godeps/Godeps.json @@ -160,23 +160,23 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json index 9d51e87462..e91652872f 100644 --- a/staging/src/k8s.io/sample-controller/Godeps/Godeps.json +++ b/staging/src/k8s.io/sample-controller/Godeps/Godeps.json @@ -96,23 +96,23 @@ }, { "ImportPath": "golang.org/x/net/context", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http/httpguts", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/http2/hpack", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/net/idna", - "Rev": "a4630153038d3cb8c57f83d95200aea356145cf5" + "Rev": "65e2d4e15006aab9813ff8769e768bbf4bb667a0" }, { "ImportPath": "golang.org/x/oauth2", diff --git a/vendor/golang.org/x/net/context/ctxhttp/BUILD b/vendor/golang.org/x/net/context/ctxhttp/BUILD index c1f5001fcb..1c66c22a30 100644 --- a/vendor/golang.org/x/net/context/ctxhttp/BUILD +++ b/vendor/golang.org/x/net/context/ctxhttp/BUILD @@ -2,14 +2,10 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", - srcs = [ - "ctxhttp.go", - "ctxhttp_pre17.go", - ], + srcs = ["ctxhttp.go"], importmap = "k8s.io/kubernetes/vendor/golang.org/x/net/context/ctxhttp", importpath = "golang.org/x/net/context/ctxhttp", visibility = ["//visibility:public"], - deps = ["//vendor/golang.org/x/net/context:go_default_library"], ) filegroup( diff --git a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go index 22eabffe5f..e0df203cea 100644 --- a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go +++ b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go @@ -2,18 +2,15 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build go1.7 - // Package ctxhttp provides helper functions for performing context-aware HTTP requests. package ctxhttp import ( + "context" "io" "net/http" "net/url" "strings" - - "golang.org/x/net/context" ) // Do sends an HTTP request with the provided http.Client and returns diff --git a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go b/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go deleted file mode 100644 index 7564b20327..0000000000 --- a/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17.go +++ /dev/null @@ -1,147 +0,0 @@ -// Copyright 2015 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// +build !go1.7 - -package ctxhttp - -import ( - "io" - "net/http" - "net/url" - "strings" - - "golang.org/x/net/context" -) - -func nop() {} - -var ( - testHookContextDoneBeforeHeaders = nop - testHookDoReturned = nop - testHookDidBodyClose = nop -) - -// Do sends an HTTP request with the provided http.Client and returns an HTTP response. -// If the client is nil, http.DefaultClient is used. -// If the context is canceled or times out, ctx.Err() will be returned. -func Do(ctx context.Context, client *http.Client, req *http.Request) (*http.Response, error) { - if client == nil { - client = http.DefaultClient - } - - // TODO(djd): Respect any existing value of req.Cancel. - cancel := make(chan struct{}) - req.Cancel = cancel - - type responseAndError struct { - resp *http.Response - err error - } - result := make(chan responseAndError, 1) - - // Make local copies of test hooks closed over by goroutines below. - // Prevents data races in tests. - testHookDoReturned := testHookDoReturned - testHookDidBodyClose := testHookDidBodyClose - - go func() { - resp, err := client.Do(req) - testHookDoReturned() - result <- responseAndError{resp, err} - }() - - var resp *http.Response - - select { - case <-ctx.Done(): - testHookContextDoneBeforeHeaders() - close(cancel) - // Clean up after the goroutine calling client.Do: - go func() { - if r := <-result; r.resp != nil { - testHookDidBodyClose() - r.resp.Body.Close() - } - }() - return nil, ctx.Err() - case r := <-result: - var err error - resp, err = r.resp, r.err - if err != nil { - return resp, err - } - } - - c := make(chan struct{}) - go func() { - select { - case <-ctx.Done(): - close(cancel) - case <-c: - // The response's Body is closed. - } - }() - resp.Body = ¬ifyingReader{resp.Body, c} - - return resp, nil -} - -// Get issues a GET request via the Do function. -func Get(ctx context.Context, client *http.Client, url string) (*http.Response, error) { - req, err := http.NewRequest("GET", url, nil) - if err != nil { - return nil, err - } - return Do(ctx, client, req) -} - -// Head issues a HEAD request via the Do function. -func Head(ctx context.Context, client *http.Client, url string) (*http.Response, error) { - req, err := http.NewRequest("HEAD", url, nil) - if err != nil { - return nil, err - } - return Do(ctx, client, req) -} - -// Post issues a POST request via the Do function. -func Post(ctx context.Context, client *http.Client, url string, bodyType string, body io.Reader) (*http.Response, error) { - req, err := http.NewRequest("POST", url, body) - if err != nil { - return nil, err - } - req.Header.Set("Content-Type", bodyType) - return Do(ctx, client, req) -} - -// PostForm issues a POST request via the Do function. -func PostForm(ctx context.Context, client *http.Client, url string, data url.Values) (*http.Response, error) { - return Post(ctx, client, url, "application/x-www-form-urlencoded", strings.NewReader(data.Encode())) -} - -// notifyingReader is an io.ReadCloser that closes the notify channel after -// Close is called or a Read fails on the underlying ReadCloser. -type notifyingReader struct { - io.ReadCloser - notify chan<- struct{} -} - -func (r *notifyingReader) Read(p []byte) (int, error) { - n, err := r.ReadCloser.Read(p) - if err != nil && r.notify != nil { - close(r.notify) - r.notify = nil - } - return n, err -} - -func (r *notifyingReader) Close() error { - err := r.ReadCloser.Close() - if r.notify != nil { - close(r.notify) - r.notify = nil - } - return err -} diff --git a/vendor/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go index 5eb7c5a8ff..a3a918f0b3 100644 --- a/vendor/golang.org/x/net/html/const.go +++ b/vendor/golang.org/x/net/html/const.go @@ -97,8 +97,16 @@ func isSpecialElement(element *Node) bool { switch element.Namespace { case "", "html": return isSpecialElementMap[element.Data] + case "math": + switch element.Data { + case "mi", "mo", "mn", "ms", "mtext", "annotation-xml": + return true + } case "svg": - return element.Data == "foreignObject" + switch element.Data { + case "foreignObject", "desc", "title": + return true + } } return false } diff --git a/vendor/golang.org/x/net/html/node.go b/vendor/golang.org/x/net/html/node.go index 2c1cade607..633ee15dc5 100644 --- a/vendor/golang.org/x/net/html/node.go +++ b/vendor/golang.org/x/net/html/node.go @@ -177,7 +177,7 @@ func (s *nodeStack) index(n *Node) int { // contains returns whether a is within s. func (s *nodeStack) contains(a atom.Atom) bool { for _, n := range *s { - if n.DataAtom == a { + if n.DataAtom == a && n.Namespace == "" { return true } } diff --git a/vendor/golang.org/x/net/html/parse.go b/vendor/golang.org/x/net/html/parse.go index d5b0aee1a8..488e8d3cd6 100644 --- a/vendor/golang.org/x/net/html/parse.go +++ b/vendor/golang.org/x/net/html/parse.go @@ -209,27 +209,6 @@ loop: p.oe = p.oe[:i+1] } -// generateAllImpliedEndTags pops nodes off the stack of open elements as long as -// the top node has a tag name of caption, colgroup, dd, div, dt, li, optgroup, option, p, rb, -// rp, rt, rtc, span, tbody, td, tfoot, th, thead or tr. -func (p *parser) generateAllImpliedEndTags() { - var i int - for i = len(p.oe) - 1; i >= 0; i-- { - n := p.oe[i] - if n.Type == ElementNode { - switch n.DataAtom { - // TODO: remove this divergence from the HTML5 spec - case a.Caption, a.Colgroup, a.Dd, a.Div, a.Dt, a.Li, a.Optgroup, a.Option, a.P, a.Rb, - a.Rp, a.Rt, a.Rtc, a.Span, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr: - continue - } - } - break - } - - p.oe = p.oe[:i+1] -} - // addChild adds a child node n to the top element, and pushes n onto the stack // of open elements if it is an element node. func (p *parser) addChild(n *Node) { @@ -276,7 +255,7 @@ func (p *parser) fosterParent(n *Node) { } } - if template != nil && (table == nil || j < i) { + if template != nil && (table == nil || j > i) { template.AppendChild(n) return } @@ -491,6 +470,10 @@ func (p *parser) resetInsertionMode() { case a.Table: p.im = inTableIM case a.Template: + // TODO: remove this divergence from the HTML5 spec. + if n.Namespace != "" { + continue + } p.im = p.templateStack.top() case a.Head: // TODO: remove this divergence from the HTML5 spec. @@ -679,8 +662,16 @@ func inHeadIM(p *parser) bool { if !p.oe.contains(a.Template) { return true } - p.generateAllImpliedEndTags() - p.popUntil(defaultScope, a.Template) + // TODO: remove this divergence from the HTML5 spec. + // + // See https://bugs.chromium.org/p/chromium/issues/detail?id=829668 + p.generateImpliedEndTags() + for i := len(p.oe) - 1; i >= 0; i-- { + if n := p.oe[i]; n.Namespace == "" && n.DataAtom == a.Template { + p.oe = p.oe[:i] + break + } + } p.clearActiveFormattingElements() p.templateStack.pop() p.resetInsertionMode() @@ -997,6 +988,14 @@ func inBodyIM(p *parser) bool { p.acknowledgeSelfClosingTag() p.popUntil(buttonScope, a.P) p.parseImpliedToken(StartTagToken, a.Form, a.Form.String()) + if p.form == nil { + // NOTE: The 'isindex' element has been removed, + // and the 'template' element has not been designed to be + // collaborative with the index element. + // + // Ignore the token. + return true + } if action != "" { p.form.Attr = []Attribute{{Key: "action", Val: action}} } @@ -1071,13 +1070,7 @@ func inBodyIM(p *parser) bool { p.acknowledgeSelfClosingTag() } return true - case a.Frame: - // TODO: remove this divergence from the HTML5 spec. - if p.oe.contains(a.Template) { - p.addElement() - return true - } - case a.Caption, a.Col, a.Colgroup, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr: + case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr: // Ignore the token. default: p.reconstructActiveFormattingElements() @@ -1271,12 +1264,6 @@ func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) { switch commonAncestor.DataAtom { case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr: p.fosterParent(lastNode) - case a.Template: - // TODO: remove namespace checking - if commonAncestor.Namespace == "html" { - commonAncestor = commonAncestor.LastChild - } - fallthrough default: commonAncestor.AppendChild(lastNode) } @@ -1348,9 +1335,6 @@ func textIM(p *parser) bool { // Section 12.2.6.4.9. func inTableIM(p *parser) bool { switch p.tok.Type { - case ErrorToken: - // Stop parsing. - return true case TextToken: p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1) switch p.oe.top().DataAtom { @@ -1445,6 +1429,8 @@ func inTableIM(p *parser) bool { case DoctypeToken: // Ignore the token. return true + case ErrorToken: + return inBodyIM(p) } p.fosterParenting = true @@ -1547,6 +1533,8 @@ func inColumnGroupIM(p *parser) bool { case a.Template: return inHeadIM(p) } + case ErrorToken: + return inBodyIM(p) } if p.oe.top().DataAtom != a.Colgroup { return true @@ -1711,9 +1699,6 @@ func inCellIM(p *parser) bool { // Section 12.2.6.4.16. func inSelectIM(p *parser) bool { switch p.tok.Type { - case ErrorToken: - // Stop parsing. - return true case TextToken: p.addText(strings.Replace(p.tok.Data, "\x00", "", -1)) case StartTagToken: @@ -1734,8 +1719,12 @@ func inSelectIM(p *parser) bool { } p.addElement() case a.Select: - p.tok.Type = EndTagToken - return false + if p.popUntil(selectScope, a.Select) { + p.resetInsertionMode() + } else { + // Ignore the token. + return true + } case a.Input, a.Keygen, a.Textarea: if p.elementInScope(selectScope, a.Select) { p.parseImpliedToken(EndTagToken, a.Select, a.Select.String()) @@ -1765,6 +1754,9 @@ func inSelectIM(p *parser) bool { case a.Select: if p.popUntil(selectScope, a.Select) { p.resetInsertionMode() + } else { + // Ignore the token. + return true } case a.Template: return inHeadIM(p) @@ -1777,6 +1769,8 @@ func inSelectIM(p *parser) bool { case DoctypeToken: // Ignore the token. return true + case ErrorToken: + return inBodyIM(p) } return true @@ -1788,13 +1782,22 @@ func inSelectInTableIM(p *parser) bool { case StartTagToken, EndTagToken: switch p.tok.DataAtom { case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th: - if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) { - p.parseImpliedToken(EndTagToken, a.Select, a.Select.String()) - return false - } else { + if p.tok.Type == EndTagToken && !p.elementInScope(tableScope, p.tok.DataAtom) { // Ignore the token. return true } + // This is like p.popUntil(selectScope, a.Select), but it also + // matches , not just