From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 17 Sep 2018 07:52:49 +0000 (+0800)
Subject: Merge pull request #24061 from liewegas/wip-35923
X-Git-Tag: v14.0.1~279
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=237bc951c447e72c37e05c2029e12c19f98ce61a;p=ceph.git

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>
---

237bc951c447e72c37e05c2029e12c19f98ce61a