From: Sage Weil <sage@redhat.com>
Date: Tue, 20 Oct 2015 18:07:57 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/infernalis'
X-Git-Tag: v10.2.6~165^2^2~306
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a21246bbd5cbeea98f212713e2fcb2daddd864f;p=ceph.git

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

4a21246bbd5cbeea98f212713e2fcb2daddd864f