Merge pull request #1752 from ceph/wip-da-SCA-fixes-20140501

author Sage Weil <sage@inktank.com>

Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)

committer Sage Weil <sage@inktank.com>

Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)
author Sage Weil <sage@inktank.com>
Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)
committer Sage Weil <sage@inktank.com>
Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)
committer	Sage Weil <sage@inktank.com>
	Sat, 3 May 2014 13:49:56 +0000 (06:49 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history