From: Sage Weil <sage@redhat.com>
Date: Tue, 13 Oct 2015 20:57:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v10.0.0~102
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=291eb95c52047dd0e40a9a30b99dc2eccdaf819b;p=ceph.git

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

291eb95c52047dd0e40a9a30b99dc2eccdaf819b