From: Sage Weil <sage@redhat.com>
Date: Sun, 6 Sep 2015 18:19:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v9.1.0~208
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=52283b327c776d3e103bba298a7b741547884ae7;p=ceph.git

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

52283b327c776d3e103bba298a7b741547884ae7