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 #70735 #73845 upstream release 1.11 #73913

Merged
merged 2 commits into from
Feb 18, 2019
Merged

Automated cherry pick of #70735 #73845 upstream release 1.11 #73913

merged 2 commits into from
Feb 18, 2019

Conversation

wojtek-t
Copy link
Member

Cherry pick of #73845 on release-1.11.
#70735 : Use watch cache when rv=0 even when limit is set
#73845 : Avoid going back in time in watchcache watchers

@wojtek-t wojtek-t added this to the v1.11 milestone Feb 11, 2019
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 11, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wojtek-t

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 11, 2019
@wojtek-t wojtek-t added kind/bug Categorizes issue or PR as related to a bug. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Feb 11, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. label Feb 11, 2019
@wojtek-t wojtek-t added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 11, 2019
@liggitt
Copy link
Member

liggitt commented Feb 11, 2019

pick doesn't appear clean, there were some legitimate build/test failures

@wojtek-t wojtek-t force-pushed the automated-cherry-pick-of-#70735-#73845-upstream-release-1.11 branch from 1be7ce2 to db1ca11 Compare February 11, 2019 15:02
@wojtek-t
Copy link
Member Author

pick doesn't appear clean, there were some legitimate build/test failures

@liggitt - yes sorry, BUILD file didn't merge correctly. Hopefully should be fixed now.

@wojtek-t wojtek-t force-pushed the automated-cherry-pick-of-#70735-#73845-upstream-release-1.11 branch from db1ca11 to e0c6b00 Compare February 11, 2019 15:14
@timothysc timothysc removed their request for review February 11, 2019 15:18
@wojtek-t wojtek-t force-pushed the automated-cherry-pick-of-#70735-#73845-upstream-release-1.11 branch from e0c6b00 to 042413c Compare February 11, 2019 15:31
@liggitt
Copy link
Member

liggitt commented Feb 11, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 11, 2019
@wojtek-t wojtek-t force-pushed the automated-cherry-pick-of-#70735-#73845-upstream-release-1.11 branch from 042413c to f64db3f Compare February 11, 2019 15:44
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 11, 2019
@wojtek-t
Copy link
Member Author

@liggitt - I'm sorry, one more thing (s/ParseResourceVersion/ParseListResourceVersion - in 1.11).

@liggitt
Copy link
Member

liggitt commented Feb 11, 2019

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 11, 2019
@foxish foxish added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Feb 18, 2019
@k8s-ci-robot k8s-ci-robot merged commit 902c3f5 into kubernetes:release-1.11 Feb 18, 2019
@wojtek-t wojtek-t deleted the automated-cherry-pick-of-#70735-#73845-upstream-release-1.11 branch July 5, 2019 06:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ingvagabund ingvagabund Awaiting requested review from ingvagabund

Assignees

@foxish foxish

@liggitt liggitt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.11
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@wojtek-t @k8s-ci-robot @liggitt @foxish