From: Sage Weil <sage@redhat.com>
Date: Wed, 27 Jan 2016 18:12:02 +0000 (-0500)
Subject: Merge pull request #7245 from Sandy4999/wip-mon-election
X-Git-Tag: v10.0.4~160
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=409070573a954f7870d327d05b095fb5e63c71b9;p=ceph.git

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>
---

409070573a954f7870d327d05b095fb5e63c71b9