Merge pull request #2655 from ceph/wip-9635

author João Eduardo Luís <joao.luis@inktank.com>

Tue, 7 Oct 2014 15:54:50 +0000 (15:54 +0000)

committer João Eduardo Luís <joao.luis@inktank.com>

Tue, 7 Oct 2014 15:54:50 +0000 (15:54 +0000)
author João Eduardo Luís <joao.luis@inktank.com>
Tue, 7 Oct 2014 15:54:50 +0000 (15:54 +0000)
committer João Eduardo Luís <joao.luis@inktank.com>
Tue, 7 Oct 2014 15:54:50 +0000 (15:54 +0000)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/Monitor.h
Simple merge
author	João Eduardo Luís <joao.luis@inktank.com>
	Tue, 7 Oct 2014 15:54:50 +0000 (15:54 +0000)
committer	João Eduardo Luís <joao.luis@inktank.com>
	Tue, 7 Oct 2014 15:54:50 +0000 (15:54 +0000)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.h	patch \|	diff1 \|	diff2 \|	blob \| history