From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Jul 2017 18:19:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/luminous'
X-Git-Tag: v12.1.1~125
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b08bd580d3001027b33a615bbb527fc2a5f26c6;p=ceph.git

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

8b08bd580d3001027b33a615bbb527fc2a5f26c6