From: Sage Weil <sage@redhat.com>
Date: Fri, 28 Aug 2015 19:20:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v9.1.0~271
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbe9f577d9c96721e4484c3995fdaea821d2c58d;p=ceph.git

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

bbe9f577d9c96721e4484c3995fdaea821d2c58d