]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #23635 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 21 Aug 2018 21:38:54 +0000 (14:38 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 21 Aug 2018 21:38:54 +0000 (14:38 -0700)
* refs/pull/23635/head:
mds: use monotonic clock in beacon
mds: simplify beacon init

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/mds/MDCache.cc
src/mds/MDSRank.cc
src/mds/MDSRank.h
src/mds/Server.cc
src/mds/SessionMap.cc
src/mds/SessionMap.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge