UPSTREAM: 38196: fix mesos unit tests #12165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[test] |
|
[merge] |
|
continuous-integration/openshift-jenkins/merge Waiting: You are in the build queue at position: 1 |
|
Evaluated for origin merge up to 74f64a7 |
|
Evaluated for origin test up to 74f64a7 |
|
Goog to direct merge as soon as I see tests pass |
|
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/12082/) (Base Commit: 4705adc) |
|
Do we also need this on release-1.3 and 1.4? |
|
yes >:-( |
|
I will open PRs for the rest of the branches. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12157 which currently blocks the queue.
Upstream cherry-pick of kubernetes/kubernetes#38196.
cc: @smarterclayton @mfojtik @deads2k @liggitt
@ncdc I think the rebase will take a couple of days, or if you are so optimistic you can close this PR and pick the upstream change in yours. :)