commit 9273ee02527c608cecc74969b3e489f5dba686da
author Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com> Thu May 10 09:11:39 2018
committer Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com> Thu May 10 14:27:01 2018
tree dc8ca472f44ce735ba91183428a1791f0d16654d
parent 53400f2739169693b7f1f64cf856f6d3d780d3db
parent 955d92f93d5b091700503b53eff01b29a2c2ea0a

Merge pull request #63626 from roycaihw/release-1.9

Automatic merge from submit-queue.

Manual cherrypick of kube-openapi changes for release-1.9

**What this PR does / why we need it**:
Cherry-picks https://github.com/kubernetes/kube-openapi/pull/64 and https://github.com/kubernetes/kube-openapi/pull/67
Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec (with empty `Paths`/`Definitions`)

**Release note**:

```release-note
Fixes bugs that make apiserver panic when aggregating valid but not well formed OpenAPI spec
```

/cc @mbohlool
/sig api-machinery

Kubernetes-commit: 8d48604c2eca912159636be258a5e68bfc4c6643

Godeps/Godeps.json

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index c5abeff..c82d3e8 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -140,91 +140,91 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+			"Rev": "21efb2924c7cf1920f76af05b1fd6a325bf46dfc"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/common",
-			"Rev": "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
+			"Rev": "7ee50c0aa8059d610950c952a9ed7a5e33ab336a"
 		}
 	]
 }