]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #37190 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Sep 2020 00:27:09 +0000 (17:27 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 19 Sep 2020 00:27:09 +0000 (17:27 -0700)
* refs/pull/37190/head:
mon/MonCap: check profile_grants too while checking caps

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/mon/Session.h

Simple merge