From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 5 Jan 2016 01:59:52 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/jewel'
X-Git-Tag: v10.0.3~138
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=089e1a2baf82505aa47b8fbce380450ca526e6ce;p=ceph.git

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

089e1a2baf82505aa47b8fbce380450ca526e6ce