Merge pull request #24337 from pditommaso/patch-1

Automatic merge from submit-queue

Allow KUBE_ROOT to be defined externally
This commit is contained in:
k8s-merge-robot 2016-04-27 01:02:05 -07:00
commit fa3c49b86c

View File

@ -30,7 +30,7 @@ set -o pipefail
# echo "-=-=-=-=-=-=-=-=-=-="
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..}
source "${KUBE_ROOT}/cluster/kube-util.sh"
# Get the absolute path of the directory component of a file, i.e. the