]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commita29103e894abf19a23eff055d1c1be6c746aaa23
tree6694e1df220adbeb3d79481a392694d89764408e
parent08166e8d5a6a35d1c8bb250acaaf99044ad94173
parentfcb1679eab4240c046ba922060c20423fb35ce43
Merge PR #24226 into master

* refs/pull/24226/head:
osd/PG: fix not_ready_to_merge behavior for merge target

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