Merge pull request #14911 from ovh/bp-small-enc-eradication

author Sage Weil <sage@newdream.net>

Wed, 10 May 2017 13:15:16 +0000 (08:15 -0500)

committer GitHub <noreply@github.com>

Wed, 10 May 2017 13:15:16 +0000 (08:15 -0500)
author Sage Weil <sage@newdream.net>
Wed, 10 May 2017 13:15:16 +0000 (08:15 -0500)
committer GitHub <noreply@github.com>
Wed, 10 May 2017 13:15:16 +0000 (08:15 -0500)
diff --cc src/os/bluestore/bluestore_types.h
Simple merge
diff --cc src/test/encoding.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Wed, 10 May 2017 13:15:16 +0000 (08:15 -0500)
committer	GitHub <noreply@github.com>
	Wed, 10 May 2017 13:15:16 +0000 (08:15 -0500)
		1	2
src/os/bluestore/bluestore_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/encoding.cc	patch \|	diff1 \|	diff2 \|	blob \| history