From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 8 Aug 2023 18:19:10 +0000 (-0700)
Subject: Merge pull request #52240 from batrick/wip-61414-pacific
X-Git-Tag: v16.2.14~38
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0429a0da99eb7dbf17184668e54bba2b6facde8b;p=ceph.git

Merge pull request #52240 from batrick/wip-61414-pacific

pacific: mon/MDSMonitor: do not propose on error in prepare_update

Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

0429a0da99eb7dbf17184668e54bba2b6facde8b