Merge pull request #30276 from nhlfr/mesos-build-fix

Automatic merge from submit-queue Avoid duplicated contrib/ sources This commit removes a part of common.sh script which copied contrib/ sources for enabled contribs, which resulted in the duplicated files inside tarball. Fixes #30150  --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30276)

Merge pull request #30276 from nhlfr/mesos-build-fix
f2d9aaba · Kubernetes Submit Queue · GitHub · 42553b92 · 5a85ed76 · f2d9aaba
Commit f2d9aaba authored Aug 10, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 10, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

common.sh build/common.sh +0 -5

No files found.
--- a/build/common.sh
+++ b/build/common.sh
@@ -485,11 +485,6 @@ function kube::build::source_targets() {
          \( -path ./_\* -o -path ./.git\* \) -prune  \
        \))
  )
-  if [ -n "${KUBERNETES_CONTRIB:-}" ]; then
-    for contrib in "${KUBERNETES_CONTRIB}"; do
-      targets+=($(eval "kube::contrib::${contrib}::source_targets"))
-    done
-  fi
  echo "${targets[@]}"
 }