From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 11 Nov 2015 19:51:49 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/jewel'
X-Git-Tag: v10.0.1~89
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ce0bc15523fb5604ee51afdae5ec0320b2d7bb2;p=ceph.git

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

0ce0bc15523fb5604ee51afdae5ec0320b2d7bb2