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

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

97ea80ca41934fccafb467b37754d7a68383c26b