]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #16369 from bspark8/wip_dmc2_client_tracker
authorKefu Chai <tchaikov@gmail.com>
Tue, 14 Nov 2017 06:59:52 +0000 (14:59 +0800)
committerGitHub <noreply@github.com>
Tue, 14 Nov 2017 06:59:52 +0000 (14:59 +0800)
dmclock: Delivery of the dmclock delta, rho and phase parameter + Enabling the client service tracker

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/CMakeLists.txt
src/common/legacy_config_opts.h
src/common/options.cc
src/osd/OSD.cc
src/osd/PrimaryLogPG.cc

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