Merge pull request #15102 from majianpeng/blockdevice-pmem

author Sage Weil <sage@newdream.net>

Thu, 8 Jun 2017 18:15:52 +0000 (13:15 -0500)

committer GitHub <noreply@github.com>

Thu, 8 Jun 2017 18:15:52 +0000 (13:15 -0500)
author Sage Weil <sage@newdream.net>
Thu, 8 Jun 2017 18:15:52 +0000 (13:15 -0500)
committer GitHub <noreply@github.com>
Thu, 8 Jun 2017 18:15:52 +0000 (13:15 -0500)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/include/config-h.in.cmake
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 8 Jun 2017 18:15:52 +0000 (13:15 -0500)
committer	GitHub <noreply@github.com>
	Thu, 8 Jun 2017 18:15:52 +0000 (13:15 -0500)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/config-h.in.cmake	patch \|	diff1 \|	diff2 \|	blob \| history