Merge pull request kubernetes#22818 from andyzheng0831/enhance

Auto commit by PR queue bot
shyamjvs · Mar 23, 2016 · f8bb10b · f8bb10b
2 parents 69b3cb3 + 0a8e68f
commit f8bb10b
Show file tree

Hide file tree

Showing 6 changed files with 747 additions and 726 deletions.
diff --git a/build/common.sh b/build/common.sh
@@ -946,6 +946,7 @@ function kube::release::package_kube_manifests_tarball() {
   cp "${salt_dir}/kube-addons/namespace.yaml" "${release_stage}/trusty"
   cp "${salt_dir}/kube-addons/kube-addons.sh" "${release_stage}/trusty"
   cp "${salt_dir}/kube-addons/kube-addon-update.sh" "${release_stage}/trusty"
+  cp "${KUBE_ROOT}/cluster/gce/trusty/configure-helper.sh" "${release_stage}/trusty"
   cp -r "${salt_dir}/kube-admission-controls/limit-range" "${release_stage}/trusty"
   local objects
   objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo)