From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 5 May 2021 16:25:04 +0000 (-0700)
Subject: Merge pull request #40988 from trociny/wip-50479-octopus
X-Git-Tag: v15.2.13~3^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c148fa112533f550016e77ac76bb30faade18e51;p=ceph.git

Merge pull request #40988 from trociny/wip-50479-octopus

octopus: os/FileStore: don't propagate split/merge error to "create"/"remove"

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
---

c148fa112533f550016e77ac76bb30faade18e51