From: Josh Durgin <jdurgin@redhat.com>
Date: Tue, 22 Dec 2015 00:59:51 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/jewel'
X-Git-Tag: v10.0.3~188
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=09a3f69e6f6a42d3a517b843d98706e8850edfac;p=ceph.git

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

09a3f69e6f6a42d3a517b843d98706e8850edfac