]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #17122 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 23 Aug 2017 13:49:13 +0000 (06:49 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 23 Aug 2017 13:49:13 +0000 (06:49 -0700)
* refs/remotes/upstream/pull/17122/head:
mds: check cap string only if !allow_all

Reviewed-by: Zheng Yan <zyan@redhat.com>

Trivial merge