UPSTREAM: 0000: rename custom timeout flags to avoid collision with g…

…lobal timeout flag
openshift · Oct 3, 2016 · faf8b4a · faf8b4a
1 parent 4a7769f
commit faf8b4a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/client/restclient/request.go b/vendor/k8s.io/kubernetes/pkg/client/restclient/request.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/delete.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/replace.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/replace.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollingupdate.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/rollingupdate.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/scale.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/scale.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/stop.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/stop.go