Merge pull request #19796 from LiumxNL/fix-ooo-caused-con-reset

author Sage Weil <sage@newdream.net>

Wed, 10 Jan 2018 13:01:04 +0000 (07:01 -0600)

committer GitHub <noreply@github.com>

Wed, 10 Jan 2018 13:01:04 +0000 (07:01 -0600)
author Sage Weil <sage@newdream.net>
Wed, 10 Jan 2018 13:01:04 +0000 (07:01 -0600)
committer GitHub <noreply@github.com>
Wed, 10 Jan 2018 13:01:04 +0000 (07:01 -0600)
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 10 Jan 2018 13:01:04 +0000 (07:01 -0600)
committer	GitHub <noreply@github.com>
	Wed, 10 Jan 2018 13:01:04 +0000 (07:01 -0600)
		1	2
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history