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

Remove redundant constant definition #11586

Merged
merged 1 commit into from
Nov 3, 2016

Conversation

danwinship
Copy link
Contributor

Due to a late-breaking change in the CNI branch we ended up with two copies of AssignMacvlanAnnotation.

@dcbw PTAL
@knobunc 3.4? Low-risk though also low-benefit...

Copy link
Contributor

@knobunc knobunc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. If @dcbw likes it we should merge it.

@dcbw
Copy link
Contributor

dcbw commented Nov 2, 2016

LGTM

@knobunc
Copy link
Contributor

knobunc commented Nov 2, 2016

[merge]

Copy link

@pravisankar pravisankar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@danwinship
Copy link
Contributor Author

flake #10773
[test]

@danwinship
Copy link
Contributor Author

oof. flakes #10773, #11682, #11747
[test]

@danwinship
Copy link
Contributor Author

flakes #11650 and maybe #10663 (same failed test, though different error...)
[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 0126891

@knobunc
Copy link
Contributor

knobunc commented Nov 3, 2016

[merge]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 0126891

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11078/) (Base Commit: 6abb256)

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 3, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11078/) (Base Commit: b68b268) (Image: devenv-rhel7_5309)

@openshift-bot openshift-bot merged commit e08d457 into openshift:master Nov 3, 2016
@danwinship danwinship deleted the annotation-cleanup branch November 3, 2016 19:38
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.

5 participants