From: Sage Weil <sage@redhat.com>
Date: Wed, 8 Feb 2017 19:02:43 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/luminous'
X-Git-Tag: v12.0.1~472
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0f85b96aa8f39b7b9c97bf531c2cfde53c75267;p=ceph.git

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

b0f85b96aa8f39b7b9c97bf531c2cfde53c75267