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

Merge pull request #37920 from xuxinkun/fix-build-tools201612

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 36129, 37920)

fix kube::log::error in `start_rsyncd_container`.

fix kube::log::error of `start_rsyncd_container` in common.sh.
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
This commit is contained in:
Kubernetes Submit Queue
2016-12-14 19:40:01 -08:00
committed by GitHub
parent f2eb14a8a7 29dc75abc2
commit 9eb82fadc4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/common.sh
View File

@@ -626,7 +626,7 @@ function kube::build::start_rsyncd_container() {
local mapped_port local mapped_port
if ! mapped_port=$("${DOCKER[@]}" port "${KUBE_RSYNC_CONTAINER_NAME}" ${KUBE_CONTAINER_RSYNC_PORT} 2> /dev/null | cut -d: -f 2) ; then if ! mapped_port=$("${DOCKER[@]}" port "${KUBE_RSYNC_CONTAINER_NAME}" ${KUBE_CONTAINER_RSYNC_PORT} 2> /dev/null | cut -d: -f 2) ; then
kube:log:error "Could not get effective rsync port" kube::log::error "Could not get effective rsync port"
return 1 return 1
fi fi