Merge pull request #52710 from sttts/sttts-less-aggressive-staging-go…

…dep-mangling Automatic merge from submit-queue (batch tested with PRs 52843, 52710, 52821, 52844). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. update-staging-godeps: only mangle staging repos in staging Godeps.json - this re-adds non-staging k8s.io/* repos to the staging Godeps.jsons - x-outs instead of removing of staging dependencies in order to get a precise trigger for a complete godep restore+save run in the publisher bot. The first breaks k8s.io/kube-aggregator's staging export. The second potentially leads to inconsistent godeps in our exported staging repos. Kubernetes-commit: 3ba46ee9fab32ccaeeee4af4a80375e6e1d71ace
kubernetes · Sep 22, 2017 · e15e93d · e15e93d
2 parents 8c4d92f + 3a42130
commit e15e93d
Show file tree

Hide file tree

Showing 98 changed files with 2,248 additions and 1,018 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/vendor/k8s.io/api/apps/v1beta1/generated.proto b/vendor/k8s.io/api/apps/v1beta1/generated.proto
diff --git a/vendor/k8s.io/api/apps/v1beta1/types.go b/vendor/k8s.io/api/apps/v1beta1/types.go
diff --git a/vendor/k8s.io/api/apps/v1beta1/types_swagger_doc_generated.go b/vendor/k8s.io/api/apps/v1beta1/types_swagger_doc_generated.go
diff --git a/vendor/k8s.io/api/apps/v1beta2/generated.proto b/vendor/k8s.io/api/apps/v1beta2/generated.proto
diff --git a/vendor/k8s.io/api/apps/v1beta2/types.go b/vendor/k8s.io/api/apps/v1beta2/types.go
diff --git a/vendor/k8s.io/api/apps/v1beta2/types_swagger_doc_generated.go b/vendor/k8s.io/api/apps/v1beta2/types_swagger_doc_generated.go
diff --git a/vendor/k8s.io/api/autoscaling/v2alpha1/BUILD → vendor/k8s.io/api/autoscaling/v2beta1/BUILD b/vendor/k8s.io/api/autoscaling/v2alpha1/BUILD → vendor/k8s.io/api/autoscaling/v2beta1/BUILD
diff --git a/...or/k8s.io/api/autoscaling/v2alpha1/doc.go → vendor/k8s.io/api/autoscaling/v2beta1/doc.go b/...or/k8s.io/api/autoscaling/v2alpha1/doc.go → vendor/k8s.io/api/autoscaling/v2beta1/doc.go