Merge pull request #10150 from songbaisen/b

author Sage Weil <sage@newdream.net>

Tue, 7 Feb 2017 23:13:47 +0000 (17:13 -0600)

committer GitHub <noreply@github.com>

Tue, 7 Feb 2017 23:13:47 +0000 (17:13 -0600)
author Sage Weil <sage@newdream.net>
Tue, 7 Feb 2017 23:13:47 +0000 (17:13 -0600)
committer GitHub <noreply@github.com>
Tue, 7 Feb 2017 23:13:47 +0000 (17:13 -0600)
diff --cc src/mon/Elector.cc
Simple merge
diff --cc src/mon/Elector.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Tue, 7 Feb 2017 23:13:47 +0000 (17:13 -0600)
committer	GitHub <noreply@github.com>
	Tue, 7 Feb 2017 23:13:47 +0000 (17:13 -0600)
		1	2
src/mon/Elector.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Elector.h	patch \|	diff1 \|	diff2 \|	blob \| history