]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #20001 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 30 Jan 2018 23:17:29 +0000 (15:17 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 30 Jan 2018 23:17:29 +0000 (15:17 -0800)
* refs/pull/20001/head:
mds: use the steady clock on tick

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/common/ceph_time.h
src/mds/CDir.h
src/mds/MDBalancer.cc
src/mds/MDBalancer.h

Simple merge
diff --cc src/mds/CDir.h
Simple merge
Simple merge
Simple merge