From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Mar 2016 20:45:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.0~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cec8f23b6a3f01d21a6b357655038071510f1694;p=ceph.git

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

cec8f23b6a3f01d21a6b357655038071510f1694