From: Sage Weil <sage@redhat.com>
Date: Fri, 20 Jul 2018 18:24:21 +0000 (-0500)
Subject: Merge PR #23053 into master
X-Git-Tag: v14.0.1~825
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ca97e1272ec6f16843374ddc5c1dcac13a9b1d1;p=ceph-ci.git

Merge PR #23053 into master

* refs/pull/23053/head:
	mon: emplace mon_caps in Monitor

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

2ca97e1272ec6f16843374ddc5c1dcac13a9b1d1