From: Sage Weil <sage@redhat.com>
Date: Tue, 29 Mar 2016 19:04:16 +0000 (-0400)
Subject: Merge remote-tracking branch 'gh/jewel'
X-Git-Tag: v10.1.1~70
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88a183bd85ed1cab287041d0fa40630e835d4ba0;p=ceph.git

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

88a183bd85ed1cab287041d0fa40630e835d4ba0