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

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

b615f35a0445d9a1ce7cd4fed9dde4056fa0575c