Merge pull request #1459 from ceph/wip-7696

author Sage Weil <sage@inktank.com>

Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)
author Sage Weil <sage@inktank.com>
Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 14 Mar 2014 18:28:50 +0000 (11:28 -0700)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history