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

nautilus: mgr/dashboard: 'destroyed' view in CRUSH map viewer #33764

Merged
merged 1 commit into from
Mar 24, 2020

Conversation

shyukri
Copy link
Contributor

@shyukri shyukri commented Mar 5, 2020

backport tracker: https://tracker.ceph.com/issues/44327


backport of #33405
parent tracker: https://tracker.ceph.com/issues/44198

this backport was staged using ceph-backport.sh version 15.1.0.1009
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh

@shyukri
Copy link
Contributor Author

shyukri commented Mar 5, 2020

jenkins test dashboard

1 similar comment
@shyukri
Copy link
Contributor Author

shyukri commented Mar 5, 2020

jenkins test dashboard

Fixes: https://tracker.ceph.com/issues/44198
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
(cherry picked from commit cbb4c62)

 Conflicts:
 src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/crushmap/crushmap.component.html
 div class changed from panel to card

Adjusted the test to seek for card-header element
@smithfarm smithfarm added this to the nautilus milestone Mar 10, 2020
Copy link
Member

@epuertat epuertat left a comment

Choose a reason for hiding this comment

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

Looks good, thanks @shyukri !

@yuriw
Copy link
Contributor

yuriw commented Mar 19, 2020

@yuriw yuriw merged commit c9772a4 into ceph:nautilus Mar 24, 2020
@shyukri shyukri deleted the wip-44327-nautilus branch March 24, 2020 16:50
epuertat added a commit to rhcs-dashboard/ceph that referenced this pull request Apr 20, 2020
Backport ceph#33764 resulted in the mixing
of Bootstrap 4 classes into Nautilus dashboard, which is Bootstrap 3
based.

This fix reverts most of those unintended changes (see cbb4c62
for understanding the original extent of changes).

Fixes: https://tracker.ceph.com/issues/44198
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
s0nea pushed a commit to ceph/ceph-ci that referenced this pull request Apr 22, 2020
Backport ceph/ceph#33764 resulted in the mixing
of Bootstrap 4 classes into Nautilus dashboard, which is Bootstrap 3
based.

This fix reverts most of those unintended changes (see cbb4c62
for understanding the original extent of changes).

Fixes: https://tracker.ceph.com/issues/44198
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
callithea added a commit that referenced this pull request May 13, 2020
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.

6 participants