Merge pull request #8254 from xiexingguo/xxg-wip-osd

author Sage Weil <sage@redhat.com>

Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)

committer Sage Weil <sage@redhat.com>

Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)
author Sage Weil <sage@redhat.com>
Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)
committer Sage Weil <sage@redhat.com>
Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)
committer	Sage Weil <sage@redhat.com>
	Sat, 26 Mar 2016 20:14:02 +0000 (16:14 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history