From: Sage Weil <sage@redhat.com>
Date: Wed, 14 Oct 2015 13:05:33 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v10.0.0~100
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8178e7e0065da00c7d8065a77e13330057a369a5;p=ceph.git

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

8178e7e0065da00c7d8065a77e13330057a369a5