From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 5 Oct 2021 14:46:28 +0000 (-0700)
Subject: Merge pull request #42837 from steveftaylor/48212
X-Git-Tag: v15.2.15~9
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=587a1ee7bf9cd8d22b944b3c21bec07c0f9b48ee;p=ceph.git

Merge pull request #42837 from steveftaylor/48212

octopus: mon/OSDMonitor: account for PG merging in epoch_by_pg accounting

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

587a1ee7bf9cd8d22b944b3c21bec07c0f9b48ee