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 1cc3aee151e44dabee60a96887936024ae46e837..1c65957b42d20a17df3d842847b4a1e9040e823f 100644 (file)
--- 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 8e3e48b9b82f3f6edec2040e2b814c7ae1cc481b..41453f5a6463453c7331dda440b99c56a4eca767 100644 (file)
--- 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 8d19485d6959a60241642077c7fce2e18d89944a..d9189bde9cabc82daa234bfc28e87bc9f82237f4 100644 (file)
--- 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