From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 2 Feb 2026 21:22:07 +0000 (+0000)
Subject: Merge branch 'wip-sjust-mgr-cli-command-74042' of https://github.com/athanatos/ceph... 
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a571dd8d0bdb552694c2945239dc14a34ddab9ce;p=ceph-ci.git

Merge branch 'wip-sjust-mgr-cli-command-74042' of https://github.com/athanatos/ceph into wip-yuri4-testing-2026-02-02-2122
---

a571dd8d0bdb552694c2945239dc14a34ddab9ce
diff --cc src/pybind/mgr/dashboard/plugins/feature_toggles.py
index 6ff3931bd14,869ef04ac19..0ee72fa794f
--- a/src/pybind/mgr/dashboard/plugins/feature_toggles.py
+++ b/src/pybind/mgr/dashboard/plugins/feature_toggles.py
@@@ -1,12 -1,13 +1,13 @@@
  # -*- coding: utf-8 -*-
  
  from enum import Enum
 -from typing import Dict, List, Optional, Set, no_type_check
 +from typing import Dict, List, Optional, Set
  
  import cherrypy
- from mgr_module import CLICommand, Option
+ from mgr_module import Option
  from mgr_util import CLIWarning
  
+ from ..cli import DBCLICommand
  from ..controllers.cephfs import CephFS
  from ..controllers.iscsi import Iscsi, IscsiTarget
  from ..controllers.nfs import NFSGaneshaExports, NFSGaneshaUi