From: Sage Weil <sage@redhat.com>
Date: Thu, 1 Oct 2015 15:51:50 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v10.0.0~122
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8a21398ffb3ff588ad4b8876ea5a31fbb66e6d63;p=ceph.git

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

8a21398ffb3ff588ad4b8876ea5a31fbb66e6d63