]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24226 into master
authorSage Weil <sage@redhat.com>
Tue, 25 Sep 2018 04:14:15 +0000 (23:14 -0500)
committerSage Weil <sage@redhat.com>
Tue, 25 Sep 2018 04:14:15 +0000 (23:14 -0500)
* refs/pull/24226/head:
osd/PG: fix not_ready_to_merge behavior for merge target

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

Trivial merge