Merge remote-tracking branch 'gh/next'

author Sage Weil <sage@inktank.com>

Thu, 20 Jun 2013 19:30:54 +0000 (12:30 -0700)

committer Sage Weil <sage@inktank.com>

Thu, 20 Jun 2013 19:30:54 +0000 (12:30 -0700)
author Sage Weil <sage@inktank.com>
Thu, 20 Jun 2013 19:30:54 +0000 (12:30 -0700)
committer Sage Weil <sage@inktank.com>
Thu, 20 Jun 2013 19:30:54 +0000 (12:30 -0700)
diff --cc src/mon/LogMonitor.cc
Simple merge
diff --cc src/mon/MDSMonitor.cc
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Thu, 20 Jun 2013 19:30:54 +0000 (12:30 -0700)
committer	Sage Weil <sage@inktank.com>
	Thu, 20 Jun 2013 19:30:54 +0000 (12:30 -0700)
		1	2
src/mon/LogMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history