]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #25918 from rjfd/wip-dashboard-nfs-backend
authorLenz Grimmer <lenz@grimmer.com>
Wed, 6 Feb 2019 15:41:49 +0000 (16:41 +0100)
committerGitHub <noreply@github.com>
Wed, 6 Feb 2019 15:41:49 +0000 (16:41 +0100)
mgr/dashboard: NFS Ganesha management REST API

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
1  2 
doc/mgr/dashboard.rst
src/pybind/mgr/dashboard/security.py
src/pybind/mgr/dashboard/settings.py
src/pybind/rados/rados.pyx

Simple merge
index 501c07f1789a6fe443a6793e4f262f1f39356421,ad92214fe42addb89479ee747545e438d77850c6..cbeda6daec22515c7740617dab7d3bc9b3976b02
@@@ -23,9 -23,9 +23,10 @@@ class Scope(object)
      MANAGER = "manager"
      LOG = "log"
      GRAFANA = "grafana"
 +    PROMETHEUS = "prometheus"
      USER = "user"
      DASHBOARD_SETTINGS = "dashboard-settings"
+     NFS_GANESHA = "nfs-ganesha"
  
      @classmethod
      def all_scopes(cls):
Simple merge
Simple merge