]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #24061 from liewegas/wip-35923
authorKefu Chai <tchaikov@gmail.com>
Mon, 17 Sep 2018 07:52:49 +0000 (15:52 +0800)
committerGitHub <noreply@github.com>
Mon, 17 Sep 2018 07:52:49 +0000 (15:52 +0800)
osd/PG: write pg epoch when resurrecting pg after delete vs merge race

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
1  2 
src/osd/PG.cc

diff --cc src/osd/PG.cc
Simple merge