From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 25 May 2020 18:44:55 +0000 (-0700)
Subject: Merge PR #34507 into master
X-Git-Tag: v16.1.0~2247
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c9977e1252dd3be8c212bb42268ed7d25304ad13;p=ceph.git

Merge PR #34507 into master

* refs/pull/34507/head:
	mds: preserve ESlaveUpdate::OP_PREPARE logevent before doing commit

Reviewed-by: Zheng Yan <zyan@redhat.com>
---

c9977e1252dd3be8c212bb42268ed7d25304ad13