Merge pull request #9236 from athanatos/wip-15943

author Sage Weil <sage@redhat.com>

Thu, 2 Jun 2016 15:44:54 +0000 (11:44 -0400)

committer Sage Weil <sage@redhat.com>

Thu, 2 Jun 2016 15:44:54 +0000 (11:44 -0400)
author Sage Weil <sage@redhat.com>
Thu, 2 Jun 2016 15:44:54 +0000 (11:44 -0400)
committer Sage Weil <sage@redhat.com>
Thu, 2 Jun 2016 15:44:54 +0000 (11:44 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 2 Jun 2016 15:44:54 +0000 (11:44 -0400)
committer	Sage Weil <sage@redhat.com>
	Thu, 2 Jun 2016 15:44:54 +0000 (11:44 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history