Merge pull request #8382 from athanatos/wip-15241

author Sage Weil <sage@redhat.com>

Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)

committer Sage Weil <sage@redhat.com>

Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)
author Sage Weil <sage@redhat.com>
Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)
committer Sage Weil <sage@redhat.com>
Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)
committer	Sage Weil <sage@redhat.com>
	Wed, 30 Mar 2016 22:36:42 +0000 (18:36 -0400)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history