From: Ernesto Puerta <37327689+epuertat@users.noreply.github.com>
Date: Thu, 26 Nov 2020 12:50:59 +0000 (+0100)
Subject: Merge pull request #37763 from bk201/wip-47943-octopus
X-Git-Tag: v15.2.8~19^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=df5460fde22e4a99ea172ba03b2149f6d1336252;p=ceph.git

Merge pull request #37763 from bk201/wip-47943-octopus

octopus: mgr/dashboard: Merge disable and disableDesc

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
---

df5460fde22e4a99ea172ba03b2149f6d1336252