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

UPSTREAM: 22516: kubectl: set maxUnavailable to 1 if both fenceposts resolve to zero #7796

Merged
merged 1 commit into from
Mar 8, 2016
Merged

UPSTREAM: 22516: kubectl: set maxUnavailable to 1 if both fenceposts resolve to zero #7796

merged 1 commit into from
Mar 8, 2016

Conversation

0xmichalis
Copy link
Contributor

@0xmichalis 0xmichalis changed the title UPSTREAM: 22516: kubectl: allow ceiling maxUnavailable in case of zero surge UPSTREAM: 22516: kubectl: set maxUnavailable to 1 if both fenceposts resolve to zero Mar 7, 2016
@0xmichalis
Copy link
Contributor Author

Merged upstream, merging here too

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_requests_origin/5234/) (Image: devenv-rhel7_3643)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 1d5addf

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@liggitt
Copy link
Contributor

liggitt commented Mar 7, 2016

it's not merged into the 1.2 branch, which is what we'll be based on... trying to think how best to manage the rebase, cherry picks upstream, and cherry picks here

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 1d5addf

@0xmichalis
Copy link
Contributor Author

@liggitt this particular patch is a cherry-pick candidate upstream. We can push for the other patch that was just merged (#7828) as a cherry-pick candidate too if we want but these patches are not 8000 lines so I am not sure it's worth the hassle...

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/1898/)

@liggitt
Copy link
Contributor

liggitt commented Mar 7, 2016

ok [merge]

openshift-bot pushed a commit that referenced this pull request Mar 8, 2016
@openshift-bot openshift-bot merged commit dd55d0e into openshift:master Mar 8, 2016
@0xmichalis 0xmichalis deleted the ceil-maxunavailable-on-zero-surge branch March 8, 2016 00:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants