From: Sage Weil <sage@redhat.com>
Date: Sat, 12 Mar 2016 14:03:06 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.0~128
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41cf56062ba83f36fda5959bddd7697423b24751;p=ceph.git

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

41cf56062ba83f36fda5959bddd7697423b24751