summaryrefslogtreecommitdiffstats
path: root/filedistribution
diff options
context:
space:
mode:
authorHarald Musum <musum@yahoo-inc.com>2017-06-13 21:50:17 +0200
committerGitHub <noreply@github.com>2017-06-13 21:50:17 +0200
commitad6bb8c472d42675f9a9bbc64e506f233e7bb73e (patch)
treee7ded18c9a2b66ceb12b21108f657d44a1ae2647 /filedistribution
parent85c711b2eb22cb91eed465ae4953529ead99ea03 (diff)
Revert "Rename filedistribution programs to have vespa- prefix."
Diffstat (limited to 'filedistribution')
-rw-r--r--filedistribution/src/apps/filedistributor/.gitignore2
-rw-r--r--filedistribution/src/apps/filedistributor/CMakeLists.txt2
-rw-r--r--filedistribution/src/apps/status/.gitignore2
-rw-r--r--filedistribution/src/apps/status/CMakeLists.txt2
-rw-r--r--filedistribution/src/apps/status/vespa-status-filedistribution.sh2
5 files changed, 5 insertions, 5 deletions
diff --git a/filedistribution/src/apps/filedistributor/.gitignore b/filedistribution/src/apps/filedistributor/.gitignore
index 89aaa70637e..a41b1963b70 100644
--- a/filedistribution/src/apps/filedistributor/.gitignore
+++ b/filedistribution/src/apps/filedistributor/.gitignore
@@ -1,2 +1,2 @@
/filedistributor
-vespa-filedistributor-bin
+filedistributor-bin
diff --git a/filedistribution/src/apps/filedistributor/CMakeLists.txt b/filedistribution/src/apps/filedistributor/CMakeLists.txt
index 42e47856208..1a7ef87bbac 100644
--- a/filedistribution/src/apps/filedistributor/CMakeLists.txt
+++ b/filedistribution/src/apps/filedistributor/CMakeLists.txt
@@ -2,7 +2,7 @@
vespa_add_executable(filedistribution_filedistributor_app
SOURCES
filedistributor.cpp
- OUTPUT_NAME vespa-filedistributor-bin
+ OUTPUT_NAME filedistributor-bin
INSTALL sbin
DEPENDS
filedistribution_distributor
diff --git a/filedistribution/src/apps/status/.gitignore b/filedistribution/src/apps/status/.gitignore
index 2105a3c7051..6dc1c1fff5d 100644
--- a/filedistribution/src/apps/status/.gitignore
+++ b/filedistribution/src/apps/status/.gitignore
@@ -1,2 +1,2 @@
-/vespa-status-filedistribution-bin
+/status-filedistribution
filedistribution_status-filedistribution_app
diff --git a/filedistribution/src/apps/status/CMakeLists.txt b/filedistribution/src/apps/status/CMakeLists.txt
index e46e0c58d86..63e9752496e 100644
--- a/filedistribution/src/apps/status/CMakeLists.txt
+++ b/filedistribution/src/apps/status/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(filedistribution_status-filedistribution_app
SOURCES
status-filedistribution.cpp
INSTALL bin
- OUTPUT_NAME vespa-status-filedistribution-bin
+ OUTPUT_NAME status-filedistribution
DEPENDS
filedistribution_filedistributionmodel
filedistribution_common
diff --git a/filedistribution/src/apps/status/vespa-status-filedistribution.sh b/filedistribution/src/apps/status/vespa-status-filedistribution.sh
index 1ba56d6c798..104688a4883 100644
--- a/filedistribution/src/apps/status/vespa-status-filedistribution.sh
+++ b/filedistribution/src/apps/status/vespa-status-filedistribution.sh
@@ -65,4 +65,4 @@ ROOT=${VESPA_HOME%/}
ZKSTRING=$($ROOT/libexec/vespa/vespa-config.pl -zkstring)
test -z "$VESPA_LOG_LEVEL" && VESPA_LOG_LEVEL=warning
export VESPA_LOG_LEVEL
-exec $ROOT/bin/vespa-status-filedistribution-bin --zkstring "$ZKSTRING" $@
+exec $ROOT/bin/status-filedistribution --zkstring "$ZKSTRING" $@