Merge pull request #24657 from xiexingguo/wip-rm-device-class-fix

author Xie Xingguo <xie.xingguo@zte.com.cn>

Sat, 27 Oct 2018 01:49:57 +0000 (09:49 +0800)

committer GitHub <noreply@github.com>

Sat, 27 Oct 2018 01:49:57 +0000 (09:49 +0800)
author Xie Xingguo <xie.xingguo@zte.com.cn>
Sat, 27 Oct 2018 01:49:57 +0000 (09:49 +0800)
committer GitHub <noreply@github.com>
Sat, 27 Oct 2018 01:49:57 +0000 (09:49 +0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Xie Xingguo <xie.xingguo@zte.com.cn>
	Sat, 27 Oct 2018 01:49:57 +0000 (09:49 +0800)
committer	GitHub <noreply@github.com>
	Sat, 27 Oct 2018 01:49:57 +0000 (09:49 +0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history