]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c762349) | patch
mgr/dashboard: fix backporting issue #35926 36073/head
authorErnesto Puerta <epuertat@redhat.com>
Mon, 13 Jul 2020 15:32:54 +0000 (17:32 +0200)
committerErnesto Puerta <epuertat@redhat.com>
Mon, 13 Jul 2020 15:39:41 +0000 (17:39 +0200)
commitcfe8ebabdb6497ea61ced5d01c4cf16fe4653ed6
tree8d3c22b13eba3f4a102255f059f5dd4fd74059bctree | snapshot
parentc7623497d44e3739bbdf67a596426060c0d30953commit | diff
mgr/dashboard: fix backporting issue #35926

Incorrect conflict-solving during backporting of https://github.com/ceph/ceph/pull/34606
to Octopus (https://github.com/ceph/ceph/pull/35926) led to deletion of
some chuncks in OSD list page.

Fixes: https://tracker.ceph.com/issues/46502
Fixes: https://github.com/ceph/ceph/pull/35926
Signed-off-by: Ernesto Puerta <epuertat@redhat.com>
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/osd/osd-list/osd-list.component.html diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.