From: Loic Dachary <loic@dachary.org>
Date: Tue, 8 Dec 2015 08:03:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'ceph/jewel'
X-Git-Tag: v10.0.2~79
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84ee7c3399860b55c75d10f0ee696dcca2b25af0;p=ceph.git

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

84ee7c3399860b55c75d10f0ee696dcca2b25af0