Merge remote-tracking branch 'gh/wip-3484'

author Sage Weil <sage@inktank.com>

Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)

committer Sage Weil <sage@inktank.com>

Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)
author Sage Weil <sage@inktank.com>
Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)
committer Sage Weil <sage@inktank.com>
Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)
diff --cc src/Makefile.am
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/PGMonitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)
committer	Sage Weil <sage@inktank.com>
	Mon, 4 Mar 2013 17:18:28 +0000 (09:18 -0800)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history