From: Sage Weil <sage@redhat.com>
Date: Wed, 20 Jan 2016 21:49:12 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.0.3~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=141888609acb6020c1c093215ce786c6632e099e;p=ceph.git

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

141888609acb6020c1c093215ce786c6632e099e