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.

Sign up for GitHub

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

Jump to bottom

Update vendored ginkgo. #29571

Merged
merged 1 commit into from
Jul 28, 2016
Merged

Update vendored ginkgo. #29571

merged 1 commit into from
Jul 28, 2016

Conversation

rmmh
Copy link
Contributor

@rmmh rmmh commented Jul 25, 2016

This includes onsi/ginkgo#262, which improves the JUnit stacktraces.

Update vendored ginkgo.
ea43036 
This includes onsi/ginkgo#262, which improves the JUnit stacktraces.
@rmmh rmmh added the release-note-none Denotes a PR that doesn't merit a release note. label Jul 25, 2016
@lavalamp
Copy link
Member

lgtm

@lavalamp lavalamp added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 25, 2016
@k8s-github-robot k8s-github-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 25, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 28, 2016

GCE e2e build/test passed for commit ea43036.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit f8fa81b into kubernetes:master Jul 28, 2016
@thockin
Copy link
Member

thockin commented Aug 2, 2016

@rmmh I am fixing godep checking (#29402) and it flags this PR as not being correct. Specifically it does not reproduce when I godep restore the saved hashes and godep save.

@thockin
Copy link
Member

thockin commented Aug 2, 2016

So I don't know how this got approved, but you have essentially manually edited the vendored files. There's no Godep.json change in here.

This was referenced Aug 2, 2016
Merged
Closed
@Random-Liu
Copy link
Member

Random-Liu commented Aug 2, 2016 •
edited
Loading

@lavalamp This doesn't change the Godeps.json. Now when we do godep save, the ginkgo code in vendor will be recovered.

Ah, suddenly found that @thockin has mentioned this.

@thockin
Copy link
Member

thockin commented Aug 2, 2016

The fix for this is #29940

k8s-github-robot pushed a commit that referenced this pull request Aug 4, 2016
Merge pull request #29920 from thockin/verify-godeps-results
0e55753 
Automatic merge from submit-queue

Make verify-godeps check the results

Verify the results of godep restore/save.  When forced to run this finds a handful of real deltas that need to be resolved.

Fixes #29402

@rmmh because you wrote  #29571 which is the major culprit
@rmmh rmmh deleted the update-gingko branch August 29, 2016 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lavalamp lavalamp

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rmmh @lavalamp @k8s-bot @k8s-github-robot @thockin @Random-Liu @googlebot