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

Revert conversion reversion with fixed tests #12033

Merged
merged 2 commits into from
Jul 30, 2015
Merged

Revert conversion reversion with fixed tests #12033

merged 2 commits into from
Jul 30, 2015

Conversation

smarterclayton
Copy link
Contributor

@mikedanese

Reverts reversion of #12027

This was referenced Jul 30, 2015
Merged
Merged
@k8s-bot
Copy link

k8s-bot commented Jul 30, 2015

GCE e2e build/test passed for commit 532e1ca.

@smarterclayton
Copy link
Contributor Author

Shippable was a flake on

--- FAIL: TestDQ_ordered_add_pop (51.63 seconds)
delay_test.go:219: task 1 had delay-priority 3s, expected 2s
FAIL
coverage: 63.2% of statements
FAIL    github.com/GoogleCloudPlatform/kubernetes/contrib/mesos/pkg/queue   62.330

@mikedanese
Copy link
Member

LGTM. Will merge on green.

@mikedanese mikedanese added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 30, 2015
@smarterclayton
Copy link
Contributor Author

Trap is green

mikedanese added a commit that referenced this pull request Jul 30, 2015
@mikedanese
Merge pull request #12033 from smarterclayton/conversions_2
a3cb57f 
Revert conversion reversion with fixed tests
@mikedanese mikedanese merged commit a3cb57f into kubernetes:master Jul 30, 2015
@mikedanese
Copy link
Member

Green means trap.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@smarterclayton @k8s-bot @mikedanese @googlebot