]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21842 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 15 May 2018 13:43:00 +0000 (06:43 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 15 May 2018 13:43:00 +0000 (06:43 -0700)
* refs/pull/21842/head:
MDSMonitor: clean up use of pending fsmap in uncommitted ops
MDSMonitor: refactor last_beacons to use mono_clock
mds: refactor MDSMap init
mds: refactor FSMap init
mds: refactor Filesystem init
mds: move compat set methods to MDSMap

Reviewed-by: João Eduardo Luís <joao@suse.de>
1  2 
src/mds/FSMap.cc
src/mds/FSMap.h
src/mds/MDSDaemon.cc
src/mon/FSCommands.cc
src/mon/MDSMonitor.cc

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