From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Jul 2017 17:52:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/luminous'
X-Git-Tag: ses5-milestone9~1^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=adea59839f044c6cb350717766b708adda52776d;p=ceph.git

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

adea59839f044c6cb350717766b708adda52776d