Merge pull request #12488 from liewegas/wip-bluestore-enc

author Sage Weil <sage@redhat.com>

Thu, 15 Dec 2016 15:40:23 +0000 (09:40 -0600)

committer GitHub <noreply@github.com>

Thu, 15 Dec 2016 15:40:23 +0000 (09:40 -0600)
author Sage Weil <sage@redhat.com>
Thu, 15 Dec 2016 15:40:23 +0000 (09:40 -0600)
committer GitHub <noreply@github.com>
Thu, 15 Dec 2016 15:40:23 +0000 (09:40 -0600)
diff --cc src/include/denc.h
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 15 Dec 2016 15:40:23 +0000 (09:40 -0600)
committer	GitHub <noreply@github.com>
	Thu, 15 Dec 2016 15:40:23 +0000 (09:40 -0600)
		1	2
src/include/denc.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history