Merge pull request #9108 from tchaikov/wip-13990

author Samuel Just <sjust@redhat.com>

Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)

committer Samuel Just <sjust@redhat.com>

Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)
author Samuel Just <sjust@redhat.com>
Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)
committer Samuel Just <sjust@redhat.com>
Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Samuel Just <sjust@redhat.com>
	Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)
committer	Samuel Just <sjust@redhat.com>
	Thu, 19 May 2016 23:08:32 +0000 (16:08 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history