]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce2e989 ee3c67c)
Merge branch 'jewel-next' into jewel 14100/head
authorNathan Cutler <ncutler@suse.com>
Thu, 23 Mar 2017 08:46:53 +0000 (09:46 +0100)
committerNathan Cutler <ncutler@suse.com>
Thu, 23 Mar 2017 08:46:53 +0000 (09:46 +0100)
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 <kdreyer@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.