From: Sage Weil <sage@redhat.com>
Date: Thu, 10 May 2018 17:18:29 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/mimic'
X-Git-Tag: v14.0.0~157
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ae51aed1362d2ea10bd6a3debb0049129bde45b;p=ceph.git

Merge remote-tracking branch 'gh/mimic'
---

6ae51aed1362d2ea10bd6a3debb0049129bde45b