]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #17678 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 21 Nov 2017 21:49:24 +0000 (13:49 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 21 Nov 2017 21:49:24 +0000 (13:49 -0800)
* refs/pull/17678/head:
mon/AuthMonitor: improve error message
mon/OSDMonitor: disallow "all" as a key or value name
cephfs, mon/AuthMonitor, OSD/osdcap: make 'all' a synonym for '*'
vstart.sh: Create an admin user for each CephFS
mon/AuthMonitor: Allow * wildcard for filesystem name
OSD/OSDCap: Allow namespace and pool tag to be combined
OSD/OSDCap: Namespace globbing
mon/AuthMonitor: Use new osd auth caps for ceph fs authorize
OSD/auth caps: Add OSD auth caps based on pool tag
mon/FSCommands: Tag pools used for cephfs by default
mon/OSDMonitor: Add key/value arguments for pool tagging

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mds/MDSAuthCaps.cc
src/mon/AuthMonitor.cc
src/mon/OSDMonitor.cc
src/osd/OSD.cc
src/osd/PG.cc
src/vstart.sh

Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/vstart.sh
Simple merge