Merge pull request #13073 from chardan/jfw-wip-15475-admin_heap_command

author Sage Weil <sage@newdream.net>

Mon, 10 Apr 2017 21:24:14 +0000 (16:24 -0500)

committer GitHub <noreply@github.com>

Mon, 10 Apr 2017 21:24:14 +0000 (16:24 -0500)
author Sage Weil <sage@newdream.net>
Mon, 10 Apr 2017 21:24:14 +0000 (16:24 -0500)
committer GitHub <noreply@github.com>
Mon, 10 Apr 2017 21:24:14 +0000 (16:24 -0500)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 10 Apr 2017 21:24:14 +0000 (16:24 -0500)
committer	GitHub <noreply@github.com>
	Mon, 10 Apr 2017 21:24:14 +0000 (16:24 -0500)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history