Merge pull request #790 from ceph/wip-warnings

author Sage Weil <sage@inktank.com>

Sun, 3 Nov 2013 05:17:46 +0000 (22:17 -0700)

committer Sage Weil <sage@inktank.com>

Sun, 3 Nov 2013 05:17:46 +0000 (22:17 -0700)
author Sage Weil <sage@inktank.com>
Sun, 3 Nov 2013 05:17:46 +0000 (22:17 -0700)
committer Sage Weil <sage@inktank.com>
Sun, 3 Nov 2013 05:17:46 +0000 (22:17 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Sun, 3 Nov 2013 05:17:46 +0000 (22:17 -0700)
committer	Sage Weil <sage@inktank.com>
	Sun, 3 Nov 2013 05:17:46 +0000 (22:17 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history