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

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

4290d689598712024266bb70bfa11c2ff894f3a3