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

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…

Merge pull request #37825 from shyamjvs/kubemark-master-script-move
95b78dfb · Kubernetes Submit Queue · GitHub · 04070cbc · 06ce9ae4 · 95b78dfb
Commit 95b78dfb authored Dec 08, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

start-kubemark-master.sh test/kubemark/resources/start-kubemark-master.sh +0 -0

start-kubemark.sh test/kubemark/start-kubemark.sh +1 -1

No files found.
--- a/test/kubemark/start-kubemark-master.sh
+++ b/test/kubemark/start-kubemark-master.sh
--- a/test/kubemark/start-kubemark.sh
+++ b/test/kubemark/start-kubemark.sh
@@ -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" \