Merge pull request #13401 from liewegas/wip-kill-subop

author Sage Weil <sage@newdream.net>

Mon, 3 Apr 2017 15:00:53 +0000 (10:00 -0500)

committer GitHub <noreply@github.com>

Mon, 3 Apr 2017 15:00:53 +0000 (10:00 -0500)
author Sage Weil <sage@newdream.net>
Mon, 3 Apr 2017 15:00:53 +0000 (10:00 -0500)
committer GitHub <noreply@github.com>
Mon, 3 Apr 2017 15:00:53 +0000 (10:00 -0500)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 3 Apr 2017 15:00:53 +0000 (10:00 -0500)
committer	GitHub <noreply@github.com>
	Mon, 3 Apr 2017 15:00:53 +0000 (10:00 -0500)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history