Skip to content

fix flaky upstream unit tests#14519

Merged
smarterclayton merged 2 commits intoopenshift:masterfrom
deads2k:controller-08-deflake
Jun 11, 2017
Merged

fix flaky upstream unit tests#14519
smarterclayton merged 2 commits intoopenshift:masterfrom
deads2k:controller-08-deflake

Conversation

@deads2k
Copy link
Contributor

@deads2k deads2k commented Jun 8, 2017

already merged upstream

@deads2k
Copy link
Contributor Author

deads2k commented Jun 8, 2017

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to c0a58d8

@openshift-bot
Copy link
Contributor

[Test]ing while waiting on the merge queue

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to c0a58d8

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2014/) (Base Commit: c824f5c)

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/merge FAILURE (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/952/) (Base Commit: 6e8cd42)

@smarterclayton
Copy link
Contributor

No conflicts, flaked on unrelated. Merging directly.

@smarterclayton smarterclayton merged commit 2a8c1b8 into openshift:master Jun 11, 2017
@deads2k deads2k deleted the controller-08-deflake branch August 3, 2017 19:26
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