]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #18595 from batrick/mon-clock
authorKefu Chai <tchaikov@gmail.com>
Wed, 1 Nov 2017 02:50:52 +0000 (10:50 +0800)
committerGitHub <noreply@github.com>
Wed, 1 Nov 2017 02:50:52 +0000 (10:50 +0800)
mon: a few conversions to monotonic clock

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/mon/Monitor.cc
src/osd/OSD.cc

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