]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
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)
commit7a69ebbce76b5ae2fc46a07a27d009366f31a174
treeb4b8de3710221778ec69a2949220e4f216b9f712
parentb613fbdb620c63406c098a4492997e8554ebc94d
parente77a2f5da71f1ba62b69b8d0fb9f34abe426da79
Merge PR #23635 into master

* refs/pull/23635/head:
mds: use monotonic clock in beacon
mds: simplify beacon init

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