Merge branch 'wip_watch' into next

author Sage Weil <sage@inktank.com>

Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)

committer Sage Weil <sage@inktank.com>

Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)
author Sage Weil <sage@inktank.com>
Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)
committer Sage Weil <sage@inktank.com>
Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)
committer	Sage Weil <sage@inktank.com>
	Fri, 14 Dec 2012 22:32:44 +0000 (14:32 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history