Merge pull request #24265 from trociny/wip-36091

author Jason Dillaman <dillaman@redhat.com>

Sat, 10 Nov 2018 00:56:11 +0000 (19:56 -0500)

committer GitHub <noreply@github.com>

Sat, 10 Nov 2018 00:56:11 +0000 (19:56 -0500)
author Jason Dillaman <dillaman@redhat.com>
Sat, 10 Nov 2018 00:56:11 +0000 (19:56 -0500)
committer GitHub <noreply@github.com>
Sat, 10 Nov 2018 00:56:11 +0000 (19:56 -0500)
diff --cc src/mgr/DaemonServer.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Sat, 10 Nov 2018 00:56:11 +0000 (19:56 -0500)
committer	GitHub <noreply@github.com>
	Sat, 10 Nov 2018 00:56:11 +0000 (19:56 -0500)
		1	2
src/mgr/DaemonServer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history