]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit237bc951c447e72c37e05c2029e12c19f98ce61a
tree06cac9ce09426db5b42d8b480f0cd73d40ebb69b
parent3d1d33742860f5c75203ca6eda8959d451dd12ca
parent05a7443f224fe8256ad5669eaaf71b6cf3c3a764
Merge pull request #24061 from liewegas/wip-35923

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>
src/osd/PG.cc