Merge pull request #10243 from jcsp/wip-cephfs-cleanup

author John Spray <jspray@redhat.com>

Mon, 25 Jul 2016 14:20:42 +0000 (15:20 +0100)

committer GitHub <noreply@github.com>

Mon, 25 Jul 2016 14:20:42 +0000 (15:20 +0100)
author John Spray <jspray@redhat.com>
Mon, 25 Jul 2016 14:20:42 +0000 (15:20 +0100)
committer GitHub <noreply@github.com>
Mon, 25 Jul 2016 14:20:42 +0000 (15:20 +0100)
diff --cc ceph.spec.in
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	John Spray <jspray@redhat.com>
	Mon, 25 Jul 2016 14:20:42 +0000 (15:20 +0100)
committer	GitHub <noreply@github.com>
	Mon, 25 Jul 2016 14:20:42 +0000 (15:20 +0100)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history