From: Sage Weil <sage@newdream.net>
Date: Fri, 9 Jun 2017 14:13:59 +0000 (-0500)
Subject: Merge pull request #15600 from ceph/luminous
X-Git-Tag: v12.1.0~202
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3904aad0ca0d9d1414c866d57ca21292af0ebaa;p=ceph.git

Merge pull request #15600 from ceph/luminous

12.0.3
---

f3904aad0ca0d9d1414c866d57ca21292af0ebaa