]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge remote-tracking branch 'origin/wip-15065'
authorGreg Farnum <gfarnum@redhat.com>
Fri, 25 Mar 2016 00:55:56 +0000 (17:55 -0700)
committerGreg Farnum <gfarnum@redhat.com>
Fri, 25 Mar 2016 00:55:56 +0000 (17:55 -0700)
Support new standby_for_fscid option, letting us assign daemons to FS clusters.

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

Simple merge
Simple merge
Simple merge