Merge pull request #13296 from liewegas/wip-kill-sortbitwise

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

Thu, 9 Feb 2017 00:12:10 +0000 (16:12 -0800)

committer GitHub <noreply@github.com>

Thu, 9 Feb 2017 00:12:10 +0000 (16:12 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Thu, 9 Feb 2017 00:12:10 +0000 (16:12 -0800)
committer GitHub <noreply@github.com>
Thu, 9 Feb 2017 00:12:10 +0000 (16:12 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Thu, 9 Feb 2017 00:12:10 +0000 (16:12 -0800)
committer	GitHub <noreply@github.com>
	Thu, 9 Feb 2017 00:12:10 +0000 (16:12 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history