Merge remote-tracking branch 'upstream/wip-ecbackend-for-review'

author Samuel Just <sam.just@inktank.com>

Tue, 18 Feb 2014 18:56:02 +0000 (10:56 -0800)

committer Samuel Just <sam.just@inktank.com>

Tue, 18 Feb 2014 18:56:12 +0000 (10:56 -0800)
author Samuel Just <sam.just@inktank.com>
Tue, 18 Feb 2014 18:56:02 +0000 (10:56 -0800)
committer Samuel Just <sam.just@inktank.com>
Tue, 18 Feb 2014 18:56:12 +0000 (10:56 -0800)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Tue, 18 Feb 2014 18:56:02 +0000 (10:56 -0800)
committer	Samuel Just <sam.just@inktank.com>
	Tue, 18 Feb 2014 18:56:12 +0000 (10:56 -0800)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history