Merge pull request #14593 from sttts/sttts-upstream-46112

Merged by openshift-bot
openshift · Jun 14, 2017 · 00146b3 · 00146b3
2 parents bb745a7 + ba8a0ff
commit 00146b3
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 30 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/api/register.go b/vendor/k8s.io/kubernetes/pkg/api/register.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly/metaonly.go b/vendor/k8s.io/kubernetes/pkg/controller/garbagecollector/metaonly/metaonly.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/register.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/register.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/runtime/scheme.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/runtime/scheme.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/runtime/scheme_test.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/apimachinery/pkg/runtime/scheme_test.go
diff --git a/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/api/register.go b/vendor/k8s.io/kubernetes/staging/src/k8s.io/client-go/pkg/api/register.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/master/master_test.go b/vendor/k8s.io/kubernetes/test/integration/master/master_test.go