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

Second attempt to fix #29585 #29905

Merged
merged 1 commit into from
Aug 9, 2016
Merged

Second attempt to fix #29585 #29905

merged 1 commit into from
Aug 9, 2016

Conversation

luxas
Copy link
Member

@luxas luxas commented Aug 2, 2016 •
edited by k8s-oncall
Loading

@ixdy @fejta

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Aug 2, 2016
@luxas luxas added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Aug 2, 2016
@luxas luxas assigned ixdy and unassigned bgrant0607 Aug 5, 2016
@luxas
Copy link
Member Author

luxas commented Aug 5, 2016

@ixdy Does this look good to you?

@ixdy
Copy link
Member

ixdy commented Aug 9, 2016

LGTM I guess? I don't know anything about these tests.

@ixdy ixdy added lgtm "Looks good to me", indicates that a PR is ready to be merged. retest-not-required labels Aug 9, 2016
@k8s-bot
Copy link

k8s-bot commented Aug 9, 2016

GCE e2e build/test passed for commit 56755b8.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 93f802b into kubernetes:master Aug 9, 2016
@luxas
Copy link
Member Author

luxas commented Aug 9, 2016

Thanks. It was a bit awkward after the earlier PR when I noticed it was liveness probing on 80 and the app served on 5555 ;)

Now it does the right thing. I hope the liveness probes fix it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ixdy ixdy

Labels
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@luxas @ixdy @k8s-bot @k8s-github-robot @googlebot @bgrant0607