Merge pull request #14039 from dachary/wip-19307-set-deviceclass

author Yuri Weinstein <yuri.weinstein@gmail.com>

Mon, 10 Apr 2017 20:30:32 +0000 (13:30 -0700)

committer GitHub <noreply@github.com>

Mon, 10 Apr 2017 20:30:32 +0000 (13:30 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Mon, 10 Apr 2017 20:30:32 +0000 (13:30 -0700)
committer GitHub <noreply@github.com>
Mon, 10 Apr 2017 20:30:32 +0000 (13:30 -0700)
diff --cc src/mon/MonCommands.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Mon, 10 Apr 2017 20:30:32 +0000 (13:30 -0700)
committer	GitHub <noreply@github.com>
	Mon, 10 Apr 2017 20:30:32 +0000 (13:30 -0700)
		1	2
src/mon/MonCommands.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history