Merge pull request #19881 from liewegas/wip-kill-crush-location

author Sage Weil <sage@newdream.net>

Thu, 11 Jan 2018 21:48:29 +0000 (15:48 -0600)

committer GitHub <noreply@github.com>

Thu, 11 Jan 2018 21:48:29 +0000 (15:48 -0600)
author Sage Weil <sage@newdream.net>
Thu, 11 Jan 2018 21:48:29 +0000 (15:48 -0600)
committer GitHub <noreply@github.com>
Thu, 11 Jan 2018 21:48:29 +0000 (15:48 -0600)
diff --cc ceph.spec.in
Simple merge
diff --cc src/CMakeLists.txt
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 11 Jan 2018 21:48:29 +0000 (15:48 -0600)
committer	GitHub <noreply@github.com>
	Thu, 11 Jan 2018 21:48:29 +0000 (15:48 -0600)
		1	2
ceph.spec.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history