Merge pull request #7055 from xiexingguo/xxg-wip-14185

author Sage Weil <sage@redhat.com>

Wed, 13 Jan 2016 02:27:11 +0000 (21:27 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 13 Jan 2016 02:27:11 +0000 (21:27 -0500)
author Sage Weil <sage@redhat.com>
Wed, 13 Jan 2016 02:27:11 +0000 (21:27 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 13 Jan 2016 02:27:11 +0000 (21:27 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osdc/ObjectCacher.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 13 Jan 2016 02:27:11 +0000 (21:27 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 13 Jan 2016 02:27:11 +0000 (21:27 -0500)
		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
src/osdc/ObjectCacher.cc	patch \|	diff1 \|	diff2 \|	blob \| history