]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0d6614 5d9231e)
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)
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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.