Merge pull request #6766 from xiexingguo/xxg-wip-cleanup

author Sage Weil <sage@redhat.com>

Sat, 19 Dec 2015 19:02:02 +0000 (14:02 -0500)

committer Sage Weil <sage@redhat.com>

Sat, 19 Dec 2015 19:02:02 +0000 (14:02 -0500)
author Sage Weil <sage@redhat.com>
Sat, 19 Dec 2015 19:02:02 +0000 (14:02 -0500)
committer Sage Weil <sage@redhat.com>
Sat, 19 Dec 2015 19:02:02 +0000 (14:02 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 19 Dec 2015 19:02:02 +0000 (14:02 -0500)
committer	Sage Weil <sage@redhat.com>
	Sat, 19 Dec 2015 19:02:02 +0000 (14:02 -0500)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history