From: Sage Weil <sage@redhat.com>
Date: Fri, 16 Oct 2015 13:49:09 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v10.0.0~94
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=63d868106efd4d8aef71d498ba84cb2271a95a07;p=ceph.git

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

63d868106efd4d8aef71d498ba84cb2271a95a07