Merge pull request #18509 from tchaikov/wip-osd-cleanups

author Sage Weil <sage@newdream.net>

Wed, 1 Nov 2017 13:36:37 +0000 (08:36 -0500)

committer GitHub <noreply@github.com>

Wed, 1 Nov 2017 13:36:37 +0000 (08:36 -0500)
author Sage Weil <sage@newdream.net>
Wed, 1 Nov 2017 13:36:37 +0000 (08:36 -0500)
committer GitHub <noreply@github.com>
Wed, 1 Nov 2017 13:36:37 +0000 (08:36 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 1 Nov 2017 13:36:37 +0000 (08:36 -0500)
committer	GitHub <noreply@github.com>
	Wed, 1 Nov 2017 13:36:37 +0000 (08:36 -0500)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history