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

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

41d59fcc3b353f22c8c8c07bd78738c04c41dc7a