]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #39997 from sseshasa/wip-49699-pacific
authorYuri Weinstein <yweinste@redhat.com>
Fri, 19 Mar 2021 21:12:19 +0000 (14:12 -0700)
committerGitHub <noreply@github.com>
Fri, 19 Mar 2021 21:12:19 +0000 (14:12 -0700)
pacific: osd: Refinements to mclock built-in profiles implementation.

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/common/options.cc
src/osd/OSD.cc

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