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

[EUWE] Merge pull request #12005 from yrudman/raise-event-when-failover #12332

Conversation

yrudman
Copy link
Contributor

@yrudman yrudman commented Nov 1, 2016

Raise event when failover successful
(cherry picked from commit 991855a)

Original PR: #12005

There was cherry-pick conflict on backporting changes for app/decorators/miq_event_definition_decorator.rb which was resolved in this PR

Raise event when failover successful
(cherry picked from commit 991855a)
Copy link
Member

@gtanzillo gtanzillo left a comment

Choose a reason for hiding this comment

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

👍

@miq-bot
Copy link
Member

miq-bot commented Nov 1, 2016

Checked commit yrudman@05a44b3 with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1
7 files checked, 0 offenses detected
Everything looks good. 🏆

@carbonin
Copy link
Member

carbonin commented Nov 1, 2016

So, we no longer need the changes to the conflicted file? Can you give some detail around how that worked out? Was there a separate change that made the edit unnecessary?

@yrudman
Copy link
Contributor Author

yrudman commented Nov 1, 2016

There is work in progress (from UI team) to replace *.png with font icon and changes to that file was not backported to euwe. Changes in this PR was done on the top of previous changes by UI team (on master).
Keeping app/decorators/miq_event_definition_decorator.rb the same on euwe means that new event will still have *.png associated with it instead of font icon.

Copy link
Member

@carbonin carbonin left a comment

Choose a reason for hiding this comment

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

Okay sounds good 👍

@chessbyte chessbyte self-assigned this Nov 1, 2016
@chessbyte chessbyte merged commit 85f89c6 into ManageIQ:euwe Nov 1, 2016
@chessbyte chessbyte added this to the Sprint 49 Ending Nov 14, 2016 milestone Nov 1, 2016
@yrudman yrudman deleted the resolve-conflict-on-backporting-raise-server-event branch November 1, 2016 18:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants