Merge pull request #20281 from mrogers950/reconcile-carry

UPSTREAM: 64541: Add more kubectl auth reconcile flags
openshift · Jul 30, 2018 · 1c17e88 · 1c17e88
2 parents 0068d35 + 419d2c6
commit 1c17e88
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/contrib/completions/bash/oc b/contrib/completions/bash/oc
diff --git a/contrib/completions/zsh/oc b/contrib/completions/zsh/oc
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/auth/reconcile.go