Merge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer

author Sage Weil <sage@redhat.com>

Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)

committer Sage Weil <sage@redhat.com>

Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)
author Sage Weil <sage@redhat.com>
Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)
committer Sage Weil <sage@redhat.com>
Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)
committer	Sage Weil <sage@redhat.com>
	Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)
		1	2
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history