From: Nathan Cutler Date: Thu, 23 Mar 2017 08:46:53 +0000 (+0100) Subject: Merge branch 'jewel-next' into jewel X-Git-Tag: v10.2.7~25^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14100%2Fhead;p=ceph.git Merge branch 'jewel-next' into jewel Branch "jewel-next" was merged to jewel on Dec 22 (5b402f8a7b), and then PR https://github.com/ceph/ceph/pull/13143 merged to jewel-next much later (Feb 1st), and then jewel-next was never merged to jewel again before we tagged v10.2.6. This merge brings in a single commit, i.e. the one from https://github.com/ceph/ceph/pull/13143 Reported-by: Ken Dreyer Signed-off-by: Nathan Cutler --- cb9fae56ebdfda28b0606ee89631deb60e5f7de7