Merge branch 'testing' into next

author Sage Weil <sage@inktank.com>

Sat, 8 Dec 2012 17:12:21 +0000 (09:12 -0800)

committer Sage Weil <sage@inktank.com>

Sat, 8 Dec 2012 17:12:21 +0000 (09:12 -0800)
author Sage Weil <sage@inktank.com>
Sat, 8 Dec 2012 17:12:21 +0000 (09:12 -0800)
committer Sage Weil <sage@inktank.com>
Sat, 8 Dec 2012 17:12:21 +0000 (09:12 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 8 Dec 2012 17:12:21 +0000 (09:12 -0800)
committer	Sage Weil <sage@inktank.com>
	Sat, 8 Dec 2012 17:12:21 +0000 (09:12 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history