From: Sage Weil <sage@newdream.net>
Date: Mon, 15 May 2017 17:47:42 +0000 (-0500)
Subject: Merge pull request #15091 from ceph/luminous
X-Git-Tag: v12.0.3~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=880dde8e4766acddb3fa6eb9767965f57f3c4247;p=ceph.git

Merge pull request #15091 from ceph/luminous

merge v12.0.2 release tag
---

880dde8e4766acddb3fa6eb9767965f57f3c4247