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

Automated cherry pick of #24208 #24307

Merged
merged 1 commit into from
Apr 20, 2016
Merged

Automated cherry pick of #24208 #24307

merged 1 commit into from
Apr 20, 2016

Conversation

ncdc
Copy link
Member

@ncdc ncdc commented Apr 15, 2016

Cherry pick of #24208 on release-1.2.

Honor starting resourceVersion in watch cache
c0e78c4 
Compare the requested resourceVersion to each event's resourceVersion to ensure events that occurred
in the past are not sent to the client.
@ncdc
Copy link
Member Author

ncdc commented Apr 15, 2016

@wojtek-t @liggitt

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Apr 15, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 15, 2016

GCE e2e build/test passed for commit c0e78c4.

@liggitt
Copy link
Member

liggitt commented Apr 15, 2016

LGTM, needs cherry pick approval

@thockin
Copy link
Member

thockin commented Apr 18, 2016

I thought we are not doing cherry-picks this way any more?

@david-mcmahon

@thockin thockin assigned david-mcmahon and unassigned thockin Apr 18, 2016
@david-mcmahon
Copy link
Contributor

david-mcmahon commented Apr 18, 2016 •
edited
Loading

This one errantly got the release-note-label-needed label too. Removed. Adding Robby to cherrypick-approved the original PR.
cc @eparis @roberthbailey

@thockin
Copy link
Member

thockin commented Apr 18, 2016

Sorry, David schooled me, I was misinterpreting the rules. Sorry to close
your PR, Jan :)

On Mon, Apr 18, 2016 at 12:28 PM, David McMahon notifications@github.com
wrote:

This one errantly got the release-note-label-needed label too. Removed.
Adding Robby to cherrypick-approved the original PR.
cc @eparis https://github.com/eparis

—
You are receiving this because you were assigned.
Reply to this email directly or view it on GitHub
#24307 (comment)

@eparis
Copy link
Contributor

eparis commented Apr 18, 2016

Parent has "release-note-none" so this PR must follow the PR process.

@ncdc
Copy link
Member Author

ncdc commented Apr 18, 2016

Updated parent PR to "release-note"

@david-mcmahon
Copy link
Contributor

david-mcmahon commented Apr 18, 2016 •
edited
Loading

Ah yes, @eparis, that makes sense, but it is confusing that the cherrypick PR (that shouldn't have release-note-* label management) gets release-note-label-needed when the parent PR doesn't have a valid release-note- label (which is required for cherrypicks to a branch). I don't immediately see a better way to handle this unless we can detect that the parent has been cherrypicked and that release-note-none is invalid and then update the parent PR with release-note-label-needed.

@eparis
Copy link
Contributor

eparis commented Apr 18, 2016

I think the best I can do is to comment in the cherrypick-pr why it is getting the 'cp-label-needed' label.

@eparis
Copy link
Contributor

eparis commented Apr 18, 2016

(and then a human needs to solve the situation)

@david-mcmahon
Copy link
Contributor

@eparis that works too. Something to tie the two together. Thank you for continuing to adjust on this.

@roberthbailey roberthbailey added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Apr 19, 2016
@roberthbailey
Copy link
Contributor

Let's see if the bot will merge this w/o a release note label or if it complains...

@eparis
Copy link
Contributor

eparis commented Apr 19, 2016

we can really test the bot, and remove cp-approved. see if it automatically gets applied from the parent...

@eparis eparis removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 19, 2016
@eparis
Copy link
Contributor

eparis commented Apr 19, 2016

I'll keep and eye on this pr. I'm hoping the automation system is going to automatically apply cp-approved, the milestone, and will get it into the merge queue.

@roberthbailey
Copy link
Contributor

roberthbailey commented Apr 19, 2016 •
edited
Loading

@eparis sgtm; thanks.

@k8s-github-robot k8s-github-robot added this to the v1.2 milestone Apr 19, 2016
@k8s-github-robot k8s-github-robot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 19, 2016
@eparis
Copy link
Contributor

eparis commented Apr 19, 2016

The bot works!!!

@k8s-bot
Copy link

k8s-bot commented Apr 19, 2016

GCE e2e build/test passed for commit c0e78c4.

@zmerlynn zmerlynn merged commit 03d2a7c into kubernetes:release-1.2 Apr 20, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@zmerlynn
Merge pull request kubernetes#24307 from ncdc/automated-cherry-pick-o…
fffd0ce 
…f-#24208-upstream-release-1.2

Automated cherry pick of kubernetes#24208
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@zmerlynn
Merge pull request kubernetes#24307 from ncdc/automated-cherry-pick-o…
8949db3 
…f-#24208-upstream-release-1.2

Automated cherry pick of kubernetes#24208
@ncdc ncdc deleted the automated-cherry-pick-of-#24208-upstream-release-1.2 branch October 22, 2018 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@roberthbailey roberthbailey

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.