From: Sage Weil <sage@inktank.com>
Date: Tue, 29 Oct 2013 20:58:14 +0000 (-0700)
Subject: Revert "ceph-crush-location: new crush location hook"
X-Git-Tag: v0.72-rc1~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e2e4297f8ed56ad83fb2083ae7e0ff4b86bdee1;p=ceph.git

Revert "ceph-crush-location: new crush location hook"

This reverts commit fc49065d855cfd74cb861d294f3464dd616e82ee.

Merged to wrong branch; my bad!
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 1cc3aee151e44..1c65957b42d20 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -391,7 +391,6 @@ fi
 %{_bindir}/ceph-authtool
 %{_bindir}/ceph-syn
 %{_bindir}/ceph-post-file
-%{_bindir}/ceph-crush-location
 %{_bindir}/ceph-run
 %{_bindir}/ceph-mon
 %{_bindir}/ceph-mds
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 8e3e48b9b82f3..41453f5a64634 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -6,7 +6,6 @@ usr/bin/ceph-conf
 usr/bin/ceph-dencoder
 usr/bin/ceph-rest-api
 usr/bin/ceph-syn
-usr/bin/ceph-crush-location
 usr/bin/rados
 usr/bin/rbd
 usr/bin/ceph-post-file
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d19485d6959a..d9189bde9cabc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -180,7 +180,6 @@ EXTRA_DIST += \
 	ceph-disk-udev \
 	ceph-create-keys \
 	ceph-rest-api \
-	ceph-crush-location \
 	mount.fuse.ceph \
 	rbdmap \
 	unittest_bufferlist.sh \
@@ -237,8 +236,7 @@ bin_SCRIPTS += \
 	ceph-clsinfo \
 	ceph-debugpack \
 	ceph-rbdnamer \
-	ceph-post-file \
-	ceph-crush-location
+	ceph-post-file
 
 BUILT_SOURCES += init-ceph
 su_sbin_SCRIPTS += mkcephfs