Merge pull request #61904 from mikedanese/fixflake

Automatic merge from submit-queue (batch tested with PRs 61904, 61565, 61401, 61432, 61772). 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>. fix flaky integration tests fixes https://github.com/kubernetes/kubernetes/issues/61893

Merge pull request #61904 from mikedanese/fixflake
1beec5f6 · Kubernetes Submit Queue · GitHub · 32db4e1a · 304debc7 · 1beec5f6
Unverified Commit 1beec5f6 authored Mar 29, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 29, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

kubeadm.sh cluster/kubeadm.sh +0 -1

No files found.
--- a/cluster/kubeadm.sh
+++ b/cluster/kubeadm.sh
@@ -19,7 +19,6 @@ set -o nounset
 set -o pipefail

 KUBE_ROOT=${KUBE_ROOT:-$(dirname "${BASH_SOURCE}")/..}
-source "${KUBE_ROOT}/cluster/kube-util.sh"
 source "${KUBE_ROOT}/cluster/clientbin.sh"

 # If KUBEADM_PATH isn't set, gather up the list of likely places and use ls