Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid duplicated contrib/ sources #30276

Merged
merged 1 commit into from
Aug 10, 2016

Conversation

nhlfr
Copy link

@nhlfr nhlfr commented Aug 9, 2016

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 Reviewable

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Aug 9, 2016
@lavalamp lavalamp assigned david-mcmahon and unassigned lavalamp Aug 9, 2016
@david-mcmahon david-mcmahon added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Aug 9, 2016
@david-mcmahon
Copy link
Contributor

This was added in 91238f8. Not sure of the history here cc @jdef .

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 kubernetes#30150
@k8s-bot
Copy link

k8s-bot commented Aug 10, 2016

GCE e2e build/test passed for commit 5a85ed7.

@david-mcmahon david-mcmahon added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 10, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Aug 10, 2016

GCE e2e build/test passed for commit 5a85ed7.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit f2d9aab into kubernetes:master Aug 10, 2016
@jdef
Copy link
Contributor

jdef commented Aug 30, 2016

thanks for pinging me on this. just catching up on a huge email backlog.

history is that when the commit (that you ref'd) was made, target dirs were specifically named. so we committed a change to include optional CONTRIB targets. the latest code does a find . -- and THAT is responsible for introducing the dups.

this change looks good.

@nhlfr nhlfr deleted the mesos-build-fix branch September 28, 2016 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants