github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37825 from shyamjvs/kubemark-master-script-move

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 35939, 38381, 37825, 38306, 38110)

Moved start-kubemark-master.sh from test/kubemark/ to test/kubemark/r…
This commit is contained in:
Kubernetes Submit Queue 2016-12-08 07:52:49 -08:00 committed by GitHub
commit 95b78dfb66
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
test/kubemark/start-kubemark-master.sh → test/kubemark/resources/start-kubemark-master.sh
View File

2
test/kubemark/start-kubemark.sh
View File

@ -163,7 +163,7 @@ writeEnvironmentFiles
gcloud compute copy-files --zone="${ZONE}" --project="${PROJECT}" \
"${SERVER_BINARY_TAR}" \
"${KUBEMARK_DIRECTORY}/start-kubemark-master.sh" \
"${RESOURCE_DIRECTORY}/start-kubemark-master.sh" \
"${KUBEMARK_DIRECTORY}/configure-kubectl.sh" \
"${RESOURCE_DIRECTORY}/apiserver_flags" \
"${RESOURCE_DIRECTORY}/scheduler_flags" \