diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2017-06-14 14:06:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 14:06:10 +0200 |
| commit | 76ef529f53cf81e9e7cff200443686234b9607ab (patch) | |
| tree | e9a009e5e2d8ef08bab4f46dbe9efac4c76e2d7c /filedistribution | |
| parent | 6fc31227f8e7ddfddf3ad69aac8f97f03c8fb1d2 (diff) | |
Revert "Revert "Rename filedistribution programs to have vespa- prefix.""
Diffstat (limited to 'filedistribution')
5 files changed, 5 insertions, 5 deletions
diff --git a/filedistribution/src/apps/filedistributor/.gitignore b/filedistribution/src/apps/filedistributor/.gitignore index a41b1963b70..89aaa70637e 100644 --- a/filedistribution/src/apps/filedistributor/.gitignore +++ b/filedistribution/src/apps/filedistributor/.gitignore @@ -1,2 +1,2 @@ /filedistributor -filedistributor-bin +vespa-filedistributor-bin diff --git a/filedistribution/src/apps/filedistributor/CMakeLists.txt b/filedistribution/src/apps/filedistributor/CMakeLists.txt index 1a7ef87bbac..42e47856208 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 filedistributor-bin + OUTPUT_NAME vespa-filedistributor-bin INSTALL sbin DEPENDS filedistribution_distributor diff --git a/filedistribution/src/apps/status/.gitignore b/filedistribution/src/apps/status/.gitignore index 6dc1c1fff5d..2105a3c7051 100644 --- a/filedistribution/src/apps/status/.gitignore +++ b/filedistribution/src/apps/status/.gitignore @@ -1,2 +1,2 @@ -/status-filedistribution +/vespa-status-filedistribution-bin filedistribution_status-filedistribution_app diff --git a/filedistribution/src/apps/status/CMakeLists.txt b/filedistribution/src/apps/status/CMakeLists.txt index 63e9752496e..e46e0c58d86 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 status-filedistribution + OUTPUT_NAME vespa-status-filedistribution-bin 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 104688a4883..1ba56d6c798 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/status-filedistribution --zkstring "$ZKSTRING" $@ +exec $ROOT/bin/vespa-status-filedistribution-bin --zkstring "$ZKSTRING" $@ |