]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #16761 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Aug 2017 20:33:51 +0000 (13:33 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 4 Aug 2017 20:33:51 +0000 (13:33 -0700)
* refs/remotes/upstream/pull/16761/head:
doc/cephfs: Document ceph auth fs
mon/AuthMonitor: Add special syntax for cephfs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>

Trivial merge