]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #42837 from steveftaylor/48212
authorYuri Weinstein <yweinste@redhat.com>
Tue, 5 Oct 2021 14:46:28 +0000 (07:46 -0700)
committerGitHub <noreply@github.com>
Tue, 5 Oct 2021 14:46:28 +0000 (07:46 -0700)
octopus: mon/OSDMonitor: account for PG merging in epoch_by_pg accounting

Reviewed-by: Neha Ojha <nojha@redhat.com>
1  2 
src/mon/OSDMonitor.cc

Simple merge