github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #14973 from gmarek/fix-jenkins

Browse Source 
Avoid overriding kubemark config variables defined in kubemark/config-default.sh script
This commit is contained in:
Marek Grabowski
2015-10-02 12:46:12 +02:00
parent 562ea7160d b283fdde12
commit 512f7c3e2c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/kubemark/util.sh
View File

@@ -15,5 +15,5 @@
# limitations under the License. # limitations under the License.
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source ${KUBE_ROOT}/cluster/kubemark/config-default.sh
source ${KUBE_ROOT}/cluster/gce/util.sh source ${KUBE_ROOT}/cluster/gce/util.sh
source ${KUBE_ROOT}/cluster/kubemark/config-default.sh