]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #28772 from neha-ojha/wip-40528-2
authorKefu Chai <kchai@redhat.com>
Wed, 24 Jul 2019 01:24:14 +0000 (09:24 +0800)
committerGitHub <noreply@github.com>
Wed, 24 Jul 2019 01:24:14 +0000 (09:24 +0800)
osd: add hdd, ssd and hybrid variants for osd_snap_trim_sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
1  2 
doc/rados/configuration/osd-config-ref.rst
src/common/options.cc
src/osd/OSD.cc
src/osd/OSD.h
src/osd/PrimaryLogPG.h

Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
Simple merge