]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7503 from tchaikov/wip-cmake-spdk
authorSage Weil <sage@redhat.com>
Fri, 5 Feb 2016 14:16:59 +0000 (09:16 -0500)
committerSage Weil <sage@redhat.com>
Fri, 5 Feb 2016 14:16:59 +0000 (09:16 -0500)
build: spdk submodule; cmake

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
CMakeLists.txt
configure.ac
src/CMakeLists.txt
src/Makefile-env.am
src/Makefile.am
src/os/bluestore/NVMEDevice.cc

diff --cc CMakeLists.txt
Simple merge
diff --cc configure.ac
Simple merge
Simple merge
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge