From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Sep 2015 15:02:54 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v9.1.0~198
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c979130755cf315bc4c6c7a6c802f7bb0b14b6b8;p=ceph.git

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

c979130755cf315bc4c6c7a6c802f7bb0b14b6b8