Bump to latest cluster-api master

openshift · Dec 23, 2018 · 44661f6 · 44661f6
1 parent e0d0ff3
commit 44661f6
Show file tree

Hide file tree

Showing 215 changed files with 3,841 additions and 10,320 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -23,8 +23,9 @@ required = [
   version = "v1.15.5"
 
 [[override]]
-name = "sigs.k8s.io/cluster-api"
-revision = "0734939e05aeb64ab198e3feeee8b4e90ee5cbb2"
+  name = "sigs.k8s.io/cluster-api"
+  branch = "master"
+  #revision = "0734939e05aeb64ab198e3feeee8b4e90ee5cbb2"
 
 # STANZAS BELOW ARE GENERATED AND MAY BE WRITTEN - DO NOT MODIFY BELOW THIS LINE.
 

diff --git a/vendor/github.com/kubernetes-incubator/apiserver-builder/.travis.yml b/vendor/github.com/kubernetes-incubator/apiserver-builder/.travis.yml
diff --git a/vendor/github.com/kubernetes-incubator/apiserver-builder/LICENSE b/vendor/github.com/kubernetes-incubator/apiserver-builder/LICENSE
diff --git a/vendor/github.com/kubernetes-incubator/apiserver-builder/OWNERS b/vendor/github.com/kubernetes-incubator/apiserver-builder/OWNERS