github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #22805 from NeilHanlon/master

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-10 13:22:32 -08:00
parent 5b00059fd2 df7f55f616
commit dec124bd57
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/vsphere/util.sh
View File

@@ -236,7 +236,7 @@ function kube-check {
let effective_timeout=($timeout/$sleepstep) let effective_timeout=($timeout/$sleepstep)
attempt=0 attempt=0
echo echo
printf "This may take several minutes. Bound to $effective_timeout attemmps" printf "This may take several minutes. Bound to $effective_timeout attempts"
while true; do while true; do
local rc=0 local rc=0
output=$(kube-ssh ${nodeip} "${cmd}") || rc=1 output=$(kube-ssh ${nodeip} "${cmd}") || rc=1
@@ -274,7 +274,7 @@ function remote-pgrep {
max_attempt=60 max_attempt=60
printf "This may take several minutes. Bound to $max_attempt attemmps" printf "This may take several minutes. Bound to $max_attempt attempts"
attempt=0 attempt=0
while true; do while true; do