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

Backport issue 32551 #36099

Merged
merged 3 commits into from
Nov 5, 2016
Merged

Backport issue 32551 #36099

merged 3 commits into from
Nov 5, 2016

Conversation

bowei
Copy link
Member

@bowei bowei commented Nov 2, 2016 •
edited by jessfraz
Loading

  • Adds TCPCloseWaitTimeout option to kube-proxy for sysctl nf_conntrack_tcp_timeout_time_wait
  • Add test image for networking related tests
  • Update generated code
Adds TCPCloseWaitTimeout option to kube-proxy for sysctl nf_conntrack_tcp_timeout_time_wait

This change is Reviewable

@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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-label-needed labels Nov 2, 2016
@bowei
Copy link
Member Author

bowei commented Nov 3, 2016

@k8s-bot verify test this

1 similar comment
@bowei
Copy link
Member Author

bowei commented Nov 3, 2016

@k8s-bot verify test this

@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit 3f9054e. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@bowei
Copy link
Member Author

bowei commented Nov 4, 2016

looks like failing due to godep issue

@jessfraz jessfraz added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Nov 4, 2016
@jessfraz jessfraz added this to the v1.4 milestone Nov 4, 2016
@jessfraz
Copy link
Contributor

jessfraz commented Nov 4, 2016

rebase after #36203 is merged to fix the godep issue

@bowei
Copy link
Member Author

bowei commented Nov 4, 2016

@k8s-bot verify test this

@bowei
Copy link
Member Author

bowei commented Nov 4, 2016

@jessfraz can you lgtm? or @thockin

@thockin
Copy link
Member

thockin commented Nov 5, 2016

LGTM

@thockin thockin added lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Nov 5, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 28e092e into kubernetes:release-1.4 Nov 5, 2016
@k8s-cherrypick-bot
Copy link

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

@jessfraz
Copy link
Contributor

jessfraz commented Nov 5, 2016

Thanks so much

On Nov 5, 2016 10:09, "k8s-cherrypick-bot" notifications@github.com wrote:

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

—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#36099 (comment),
or mute the thread
/~https://github.com/notifications/unsubscribe-auth/ABYNbJp5mhqYVgbiQzD6mFaqbv8zTJ0Dks5q7HHkgaJpZM4Knzns
.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#36099 from bowei/backport-issue-32551
bcd496b 
Automatic merge from submit-queue

Backport issue 32551

- Adds TCPCloseWaitTimeout option to kube-proxy for sysctl nf_conntrack_tcp_timeout_time_wait
- Add test image for networking related tests
- Update generated code
@bowei bowei deleted the backport-issue-32551 branch February 21, 2017 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fejta fejta

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.
8 participants
@bowei @k8s-ci-robot @jessfraz @thockin @k8s-github-robot @k8s-cherrypick-bot @fejta @googlebot