]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #36033 from smithfarm/wip-46089-octopus
authorYuri Weinstein <yweinste@redhat.com>
Tue, 14 Jul 2020 16:18:26 +0000 (09:18 -0700)
committerGitHub <noreply@github.com>
Tue, 14 Jul 2020 16:18:26 +0000 (09:18 -0700)
octopus: osd/PG: fix history.same_interval_since of merge target again

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

Trivial merge