]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3060fe 8df0f2f)
Merge pull request #36981 from neha-ojha/wip-47297-octopus
authorYuri Weinstein <yweinste@redhat.com>
Fri, 4 Sep 2020 23:07:22 +0000 (16:07 -0700)
committerGitHub <noreply@github.com>
Fri, 4 Sep 2020 23:07:22 +0000 (16:07 -0700)
octopus: mon/OSDMonitor: only take in osd into consideration when trimming osd…

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

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