]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #7245 from Sandy4999/wip-mon-election
authorSage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)
committerSage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)
commit409070573a954f7870d327d05b095fb5e63c71b9
tree19b470bd5f449f41c4572720b99ae47de49a6bb5
parente19dd6a1acba0395e373e527ec57628e3b1c1a3d
parent0a4d1a411d2cd04c23dacbad6762cf521c528237
Merge pull request #7245 from Sandy4999/wip-mon-election

mon: add an independent option for max election time

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
src/common/config_opts.h
src/mon/Monitor.cc