]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #8300 from jcsp/wip-standby-replay-reorg
authorGregory Farnum <greg@gregs42.com>
Wed, 4 May 2016 14:28:19 +0000 (07:28 -0700)
committerGregory Farnum <greg@gregs42.com>
Wed, 4 May 2016 14:28:19 +0000 (07:28 -0700)
mds: Fix standby replay MDS in upgrades and simplify standby replay logic (#15591)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
1  2 
src/mds/FSMap.cc
src/mds/MDSMap.cc
src/mds/MDSMap.h
src/mds/MDSRank.cc
src/mon/MDSMonitor.cc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge