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

Use watch param instead of deprecated /watch/ prefix #41887

Merged
merged 3 commits into from
Feb 23, 2017

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Feb 22, 2017

Reopen of #41722 after reverted in #41774

Required #41797 to merge first

cc @deads2k @wojtek-t

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 22, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@liggitt liggitt added this to the v1.6 milestone Feb 22, 2017
@liggitt
Copy link
Member Author

liggitt commented Feb 22, 2017

@smarterclayton as original approver

@liggitt liggitt added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 22, 2017
@wojtek-t wojtek-t self-assigned this Feb 22, 2017
@wojtek-t
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: liggitt, wojtek-t

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Feb 22, 2017
@liggitt
Copy link
Member Author

liggitt commented Feb 22, 2017

@k8s-bot bazel test this
@k8s-bot gce etcd3 e2e test this

@liggitt liggitt added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Feb 22, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 39855, 41433, 41567, 41887, 41652)

@k8s-github-robot k8s-github-robot merged commit e5c2d71 into kubernetes:master Feb 23, 2017
@wojtek-t
Copy link
Member

I'm afraid this broke kubemark-500 again (so @deads2k fix didn't help - metrics seem to be broken again).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants