Merge pull request #36884 from feiskyer/fix-cgroup-root

Automatic merge from submit-queue Fix syntax error in local-up-cluster.sh when CGROUP_ROOT is set Fix syntax error when `CGROUP_ROOT` is set, or it will complain a following error: ``` hack/local-up-cluster.sh: line 39: CGROUP_ROOT: "": syntax error: operand expected (error token is """") ``` cc/ @derekwaynecarr

Merge pull request #36884 from feiskyer/fix-cgroup-root
97945b3f · Kubernetes Submit Queue · GitHub · 3d64d919 · 41bb1c6a · 97945b3f
Commit 97945b3f authored Nov 16, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

local-up-cluster.sh hack/local-up-cluster.sh +1 -1

No files found.
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -36,7 +36,7 @@ SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-10.0.0.0/24}
 EXPERIMENTAL_CGROUPS_PER_QOS=${EXPERIMENTAL_CGROUPS_PER_QOS:-false}
 # this is not defaulted to preserve backward compatibility.
 # if EXPERIMENTAL_CGROUPS_PER_QOS is enabled, recommend setting to /
-CGROUP_ROOT=${CGROUP_ROOT:""}
+CGROUP_ROOT=${CGROUP_ROOT:-""}
 # name of the cgroup driver, i.e. cgroupfs or systemd
 CGROUP_DRIVER=${CGROUP_DRIVER:-""}