From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 6 Jan 2016 23:43:18 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/jewel'
X-Git-Tag: v10.0.3~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=02804341b71bbd8e18dd3cf0c27946ceceda8d78;p=ceph.git

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

02804341b71bbd8e18dd3cf0c27946ceceda8d78