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

Small fix in salt manifest for kube-apiserver for request-timeout flag #52316

Merged
merged 1 commit into from
Sep 13, 2017
Merged

Small fix in salt manifest for kube-apiserver for request-timeout flag #52316

merged 1 commit into from
Sep 13, 2017

Conversation

jpbetz
Copy link
Contributor

@jpbetz jpbetz commented Sep 11, 2017 •
edited

What this PR does / why we need it:

Fixes a minor bug in salt manifest (typo from #51480)

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes
Special notes for your reviewer:

Release note:

xref: #51355

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 11, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @jpbetz. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 11, 2017
@jpbetz
Copy link
Contributor Author

jpbetz commented Sep 11, 2017

cc @mml @enisoc

@k8s-github-robot k8s-github-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Sep 11, 2017
@xiangpengzhao
Copy link
Contributor

/release-note-none
/ok-to-test

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 12, 2017
@jpbetz
Copy link
Contributor Author

jpbetz commented Sep 12, 2017

/retest

@mml
Copy link
Contributor

mml commented Sep 12, 2017

/assign
/unassign jbeda
/unassign mikedanese

@k8s-ci-robot k8s-ci-robot assigned mml and unassigned jbeda and mikedanese Sep 12, 2017
@mml
Copy link
Contributor

mml commented Sep 12, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 12, 2017
@mml
Copy link
Contributor

mml commented Sep 12, 2017

/assign mikedanese
@mikedanese can you approve this 1-character correction plz?

@mml mml added this to the v1.8 milestone Sep 12, 2017
@jpbetz jpbetz mentioned this pull request Sep 12, 2017
Merged
@mml mml modified the milestones: v1.7, v1.8 Sep 12, 2017
@jpbetz
Copy link
Contributor Author

jpbetz commented Sep 13, 2017

/retest

@wojtek-t wojtek-t removed this from the v1.7 milestone Sep 13, 2017
@wojtek-t wojtek-t self-assigned this Sep 13, 2017
@wojtek-t
Copy link
Member

/approve no-issue

@wojtek-t wojtek-t added this to the v1.8 milestone Sep 13, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jpbetz, mml, wojtek-t

Associated issue: 51480

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

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 13, 2017
@wojtek-t wojtek-t mentioned this pull request Sep 13, 2017
Closed
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 52316, 52289, 52375)

@k8s-github-robot k8s-github-robot merged commit a789fc7 into kubernetes:master Sep 13, 2017
@wojtek-t wojtek-t modified the milestones: v1.7, v1.8 Sep 13, 2017
This was referenced Sep 13, 2017
Closed
Merged
@wojtek-t wojtek-t added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 13, 2017
k8s-github-robot pushed a commit that referenced this pull request Sep 13, 2017
Merge pull request #52415 from wojtek-t/automated-cherry-pick-of-#51480-
39c9581 
#52316-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #51480 #52316 upstream release 1.7

Cherry pick of #51480 and #52316 on release-1.7.

#51480 : Add KUBE_APISERVER_REQUEST_TIMEOUT_SEC env var.
#52316 : Small fix in salt manifest for kube-apiserver for request-timeout flag

@jpbetz
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@mml mml modified the milestones: v1.7, v1.8 Sep 14, 2017
@mml mml added cherrypick-candidate and removed cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Sep 14, 2017
@jpbetz jpbetz modified the milestone: v1.8 Oct 11, 2017
@jpbetz jpbetz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed cherrypick-candidate labels Oct 25, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mml mml

@mikedanese mikedanese

@wojtek-t wojtek-t

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. 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
v1.8
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@jpbetz @k8s-ci-robot @xiangpengzhao @mml @wojtek-t @k8s-github-robot @k8s-cherrypick-bot @jbeda @mikedanese