]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #41779 from rishabh-d-dave/fs-auth-subcmd
authorRishabh Dave <ridave@redhat.com>
Thu, 7 Sep 2023 13:09:58 +0000 (18:39 +0530)
committerGitHub <noreply@github.com>
Thu, 7 Sep 2023 13:09:58 +0000 (18:39 +0530)
mon,osd,mds: allow fs authorize to update caps

Reviewed-by: Radosław Zarzyński <rzarzyns@redhat.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
1  2 
PendingReleaseNotes
qa/tasks/cephfs/cephfs_test_case.py
qa/tasks/cephfs/test_admin.py
src/mon/AuthMonitor.cc

Simple merge
Simple merge
index 69ac3b56cca0990df5c7f3c9f2a8a96649e710c1,42339a0497804a4ee266beb17dd2e88ec3848f01..3bb02400279892810ec11899caf7bd723bef60e0
@@@ -8,10 -8,11 +8,11 @@@ from os.path import join as os_path_joi
  
  from teuthology.exceptions import CommandFailedError
  
 -from tasks.cephfs.cephfs_test_case import CephFSTestCase
 +from tasks.cephfs.cephfs_test_case import CephFSTestCase, classhook
  from tasks.cephfs.filesystem import FileLayout, FSMissing
  from tasks.cephfs.fuse_mount import FuseMount
- from tasks.cephfs.caps_helper import CapTester
+ from tasks.cephfs.caps_helper import (CapTester, gen_mon_cap_str,
+                                       gen_osd_cap_str, gen_mds_cap_str)
  
  log = logging.getLogger(__name__)
  
Simple merge