Rebase ontop of 1.9 apimachinery code

klustria · Jan 22, 2018 · cc119d4 · cc119d4
1 parent 1fc4a91
commit cc119d4
Show file tree

Hide file tree

Showing 1,384 changed files with 72,616 additions and 17,400 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -20,7 +20,13 @@
 #  name = "github.com/x/y"
 #  version = "2.4.0"
 
-ignored = ["github.com/kubernetes-incubator/apiserver-builder","github.com/kubernetes-incubator/apiserver-builder/cmd"]
+# Uncomment to update deps with dep tool
+# ignored = ["github.com/kubernetes-incubator/apiserver-builder","github.com/kubernetes-incubator/apiserver-builder/cmd"]
+
+# Comment to update deps with dep tool
+[[constraint]]
+  branch = "v0.1-alpha.28"
+  name = "github.com/kubernetes-incubator/apiserver-builder"
 
 [[constraint]]
   name = "github.com/emicklei/go-restful"

diff --git a/vendor/k8s.io/api/Godeps/Godeps.json b/vendor/k8s.io/api/Godeps/Godeps.json
diff --git a/vendor/k8s.io/api/admission/v1alpha1/BUILD → vendor/k8s.io/api/admission/v1beta1/BUILD b/vendor/k8s.io/api/admission/v1alpha1/BUILD → vendor/k8s.io/api/admission/v1beta1/BUILD
diff --git a/vendor/k8s.io/api/admission/v1alpha1/doc.go → vendor/k8s.io/api/admission/v1beta1/doc.go b/vendor/k8s.io/api/admission/v1alpha1/doc.go → vendor/k8s.io/api/admission/v1beta1/doc.go