Skip to content

Commit

Permalink
Merge pull request kubernetes#4393 from erictune/no_port_conflict
Browse files Browse the repository at this point in the history
Show help message in kubectl.sh if no args.
  • Loading branch information
filbranden committed Feb 12, 2015
2 parents 60ab990 + 9e015fd commit e54fe11
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cluster/kubectl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,5 +128,5 @@ if [[ -n "${KUBE_MASTER_IP-}" && -z "${KUBERNETES_MASTER-}" ]]; then
export KUBERNETES_MASTER=https://${KUBE_MASTER_IP}
fi

echo "Running:" "${kubectl}" "${config[@]:+${config[@]}}" "${@}" >&2
"${kubectl}" "${config[@]:+${config[@]}}" "${@}"
echo "Running:" "${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}" >&2
"${kubectl}" "${config[@]:+${config[@]}}" "${@+$@}"

0 comments on commit e54fe11

Please sign in to comment.