]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #36161 from smithfarm/wip-46090-nautilus
authorYuri Weinstein <yweinste@redhat.com>
Tue, 28 Jul 2020 17:34:07 +0000 (10:34 -0700)
committerGitHub <noreply@github.com>
Tue, 28 Jul 2020 17:34:07 +0000 (10:34 -0700)
commit49b8c8cf7598a082e236d38d48abbbc01a64ac9d
treecb1697c59c9457b1b0999f36e7312d56a3ad4d4b
parentc0d66146b9f851317277997e661eb56fc1e110e4
parent5d9231eada9fe72506a8adffdd3df44fa2953b99
Merge pull request #36161 from smithfarm/wip-46090-nautilus

nautilus: osd/PG: fix history.same_interval_since of merge target again

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>