From: Sage Weil <sage@redhat.com>
Date: Mon, 9 Jul 2018 13:36:02 +0000 (-0500)
Subject: Merge remote-tracking branch 'private/wip-mon-snap-caps-luminous' into luminous
X-Git-Tag: v12.2.6~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ce0834dd17589ea243960a99b900c1e85cc64015;p=ceph.git

Merge remote-tracking branch 'private/wip-mon-snap-caps-luminous' into luminous
---

ce0834dd17589ea243960a99b900c1e85cc64015