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

Enable Cockpit console for RHOS provider #2039

Merged
merged 2 commits into from
Sep 1, 2017
Merged

Enable Cockpit console for RHOS provider #2039

merged 2 commits into from
Sep 1, 2017

Conversation

bmclaughlin
Copy link
Contributor

@bmclaughlin bmclaughlin commented Aug 29, 2017 •
edited
Loading

Needs to be reviewed at the same time as ManageIQ/manageiq#15901.

@miq-bot add_labels bug, compute/cloud, pending core

https://bugzilla.redhat.com/show_bug.cgi?id=1451655

@bmclaughlin bmclaughlin mentioned this pull request Aug 29, 2017
Merged
@miq-bot
Copy link
Member

miq-bot commented Aug 30, 2017

Checked commits bmclaughlin/manageiq-ui-classic@b94715b~...8deca8e with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
2 files checked, 0 offenses detected
Everything looks fine. 🏆

@h-kataria
Copy link
Contributor

verified fix in UI

@jrafanie
Copy link
Member

jrafanie commented Sep 1, 2017

@h-kataria ManageIQ/manageiq#15901 has been merged

@bmclaughlin
Copy link
Contributor Author

@miq-bot remove_label pending core

@h-kataria h-kataria self-assigned this Sep 1, 2017
@h-kataria h-kataria added this to the Sprint 68 Ending Sep 4, 2017 milestone Sep 1, 2017
@h-kataria h-kataria merged commit 9077990 into ManageIQ:master Sep 1, 2017
@bmclaughlin bmclaughlin deleted the enable-cockpit-for-rhos branch September 1, 2017 19:59
@simaishi
Copy link
Contributor

Marking as fine/conflict for now, as ManageIQ/manageiq#15901 isn't marked as fine/yes and that goes wit this PR.

ManageIQ/manageiq#15901 (comment)

@bmclaughlin bmclaughlin mentioned this pull request Dec 8, 2017
Merged
@bmclaughlin
Copy link
Contributor Author

@simaishi, this should be ready to be backported now.

simaishi pushed a commit that referenced this pull request Dec 8, 2017
@h-kataria @simaishi
Merge pull request #2039 from bmclaughlin/enable-cockpit-for-rhos
bb1c3cb 
Enable Cockpit console for RHOS provider
(cherry picked from commit 9077990)

https://bugzilla.redhat.com/show_bug.cgi?id=1496903
@simaishi
Copy link
Contributor

simaishi commented Dec 8, 2017

Fine backport details:

$ git log -1
commit bb1c3cb0dba40f5049e23ad16689dfa3b7970da9
Author: Harpreet Kataria <hkataria@redhat.com>
Date:   Fri Sep 1 14:34:14 2017 -0400

    Merge pull request #2039 from bmclaughlin/enable-cockpit-for-rhos
    
    Enable Cockpit console for RHOS provider
    (cherry picked from commit 90779908f480626ba351c4053dbdb10c386108b6)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1496903

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@h-kataria h-kataria

Labels
bug compute/cloud fine/backported
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bmclaughlin @miq-bot @h-kataria @jrafanie @simaishi