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

Fix godeps #20107

Merged
merged 2 commits into from
Jan 26, 2016
Merged

Fix godeps #20107

merged 2 commits into from
Jan 26, 2016

Conversation

eparis
Copy link
Contributor

@eparis eparis commented Jan 25, 2016

They started picking up other LICENSE files, so now
#20033
is failing.

@eparis
Copy link
Contributor Author

eparis commented Jan 25, 2016

@karlkfi didn't you add the LICENSES.md thing? Does it get checked/enforced if it is up2date anywhere?

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 25, 2016
@eparis
Copy link
Contributor Author

eparis commented Jan 25, 2016

This is a very simple set of mechanical fixes.

godep restore
rm -rf Godeps
godep save ./...
hack/update-godep-licenses.sh

And is blocking other PRs....

@k8s-bot
Copy link

k8s-bot commented Jan 25, 2016

GCE e2e test build/test passed for commit f32d7f0.

@pmorie
Copy link
Member

pmorie commented Jan 25, 2016

Looks like the mode changes on all these files came fro godep?

@eparis
Copy link
Contributor Author

eparis commented Jan 25, 2016

In my GOPATH they are +x, but godep seems to have -x'd them when it imported them....

@pmorie
Copy link
Member

pmorie commented Jan 25, 2016

Ok. LGTM.

@pmorie pmorie added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 25, 2016
@ghost ghost assigned pmorie and unassigned ghost Jan 25, 2016
@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Jan 26, 2016
Auto commit by PR queue bot
@k8s-github-robot k8s-github-robot merged commit a9bd443 into kubernetes:master Jan 26, 2016
@karlkfi
Copy link
Contributor

karlkfi commented Jan 27, 2016

@eparis hacks/verify-godep-licenses.sh runs on pre-commit hook and on travis

@eparis
Copy link
Contributor Author

eparis commented Jan 27, 2016

@karlkfi are you sure the travis hook is being enforced? It got out of date somehow and no one noticed (except me by random chance)

@karlkfi
Copy link
Contributor

karlkfi commented Jan 29, 2016

@eparis eparis deleted the fix-godep branch March 7, 2016 14:24
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. 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