]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #31857 from smithfarm/wip-40947-luminous
authorYuri Weinstein <yweinste@redhat.com>
Thu, 12 Dec 2019 16:41:43 +0000 (08:41 -0800)
committerGitHub <noreply@github.com>
Thu, 12 Dec 2019 16:41:43 +0000 (08:41 -0800)
commitaf44984f8284e07aafe881f06a1827d9e2e2f30c
tree36793f9ddd0293532813445ebee2053e27e4de4e
parentd11ca04ef4b6a042d99fc53e0ec3264eb9ab45a7
parent0c66aa7a436b34c892ae1572c729d778eacbbc64
Merge pull request #31857 from smithfarm/wip-40947-luminous

luminous:  osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
src/common/options.cc
src/osd/OSD.cc
src/osd/OSD.h