]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23053 into master
authorSage Weil <sage@redhat.com>
Fri, 20 Jul 2018 18:24:21 +0000 (13:24 -0500)
committerSage Weil <sage@redhat.com>
Fri, 20 Jul 2018 18:24:21 +0000 (13:24 -0500)
* refs/pull/23053/head:
mon: emplace mon_caps in Monitor

Reviewed-by: Kefu Chai <kchai@redhat.com>

Trivial merge