Merge pull request #7245 from Sandy4999/wip-mon-election

author Sage Weil <sage@redhat.com>

Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)
author Sage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 27 Jan 2016 18:12:02 +0000 (13:12 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history