Merge pull request openshift#58 from deads2k/rebase-01

Rebase to kube 1.11
omertuc · Jun 14, 2018 · fb83d18 · fb83d18
2 parents 6ef6704 + a7bc740
commit fb83d18
Show file tree

Hide file tree

Showing 1,519 changed files with 55,833 additions and 83,043 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -2,11 +2,11 @@ package: github.com/openshift/api
 import:
 - package: k8s.io/gengo
   repo:    git@github.com:openshift/kubernetes-gengo
-  version: openshift-3.10
+  version: origin-3.11-kubernetes-v1.11.0-beta.2
 - package: k8s.io/code-generator
   repo:    git@github.com:openshift/kubernetes-code-generator
-  version: origin-3.10-kubernetes-1.10.0
+  version: origin-3.11-kubernetes-v1.11.0-beta.2
 - package: k8s.io/apimachinery
-  version: kubernetes-1.10.2
+  version: kubernetes-1.11.0-beta.2
 - package: k8s.io/api
-  version: kubernetes-1.10.2
+  version: kubernetes-1.11.0-beta.2
diff --git a/vendor/github.com/golang/protobuf/.gitignore b/vendor/github.com/golang/protobuf/.gitignore
diff --git a/vendor/github.com/golang/protobuf/.travis.yml b/vendor/github.com/golang/protobuf/.travis.yml
diff --git a/vendor/github.com/golang/protobuf/Make.protobuf b/vendor/github.com/golang/protobuf/Make.protobuf
diff --git a/vendor/github.com/golang/protobuf/Makefile b/vendor/github.com/golang/protobuf/Makefile
diff --git a/vendor/github.com/golang/protobuf/README.md b/vendor/github.com/golang/protobuf/README.md
diff --git a/vendor/github.com/golang/protobuf/_conformance/Makefile b/vendor/github.com/golang/protobuf/_conformance/Makefile