From: Sage Weil <sage@newdream.net>
Date: Wed, 2 Aug 2017 14:46:37 +0000 (-0500)
Subject: Merge pull request #16758 from ceph/luminous
X-Git-Tag: v12.1.3~24^2~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afd9d94781275aac3084f99163c214147f0ccb15;p=ceph.git

Merge pull request #16758 from ceph/luminous

sync luminous tag back to master
---

afd9d94781275aac3084f99163c214147f0ccb15