From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 24 Dec 2015 00:32:00 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/jewel'
X-Git-Tag: v10.0.3~166
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6763%2Fhead;p=ceph.git

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

c485d29a53f6a2c1a3b561c54632dbac1c4e9473