Merge pull request #18047 from gregsfortytwo/wip-20416-bitwise-assert

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

Fri, 6 Oct 2017 19:48:35 +0000 (12:48 -0700)

committer GitHub <noreply@github.com>

Fri, 6 Oct 2017 19:48:35 +0000 (12:48 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Fri, 6 Oct 2017 19:48:35 +0000 (12:48 -0700)
committer GitHub <noreply@github.com>
Fri, 6 Oct 2017 19:48:35 +0000 (12:48 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Fri, 6 Oct 2017 19:48:35 +0000 (12:48 -0700)
committer	GitHub <noreply@github.com>
	Fri, 6 Oct 2017 19:48:35 +0000 (12:48 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history