From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Nov 2015 01:07:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.2.6~165^2^2~265
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5c232b4ed543532a8a7ac287bb3f46f16784c436;p=ceph.git

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

5c232b4ed543532a8a7ac287bb3f46f16784c436