Merge branch 'master' into balder/decouple-datatype-and-fiedlvalue-some-more

3 files changed, 4 insertions, 10 deletions

diff --git a/storage/src/vespa/storage/tools/.gitignore b/storage/src/vespa/storage/tools/.gitignore
index 6f27b7c441d..ba1c4352573 100644
--- a/storage/src/vespa/storage/tools/.gitignore
+++ b/storage/src/vespa/storage/tools/.gitignore
@@ -16,7 +16,7 @@ populatenode
 slotfilefeeder
 statfs
 stoccart
-storage-cmd
+vespa-storage-cmd
 throttlingsim
 vdsclient
 vdsdisktool
diff --git a/storage/src/vespa/storage/tools/CMakeLists.txt b/storage/src/vespa/storage/tools/CMakeLists.txt
index 3f5febcd28a..f2bbb266ef9 100644
--- a/storage/src/vespa/storage/tools/CMakeLists.txt
+++ b/storage/src/vespa/storage/tools/CMakeLists.txt
@@ -2,7 +2,6 @@
 vespa_add_executable(storage_getidealstate_app
     SOURCES
     getidealstate.cpp
-    INSTALL bin
     DEPENDS
     storage
     AFTER
@@ -11,7 +10,6 @@ vespa_add_executable(storage_getidealstate_app
 vespa_add_executable(storage_generatedistributionbits_app
     SOURCES
     generatedistributionbits.cpp
-    INSTALL bin
     DEPENDS
     storage
     AFTER
@@ -20,7 +18,6 @@ vespa_add_executable(storage_generatedistributionbits_app
 vespa_add_executable(storage_analyzedistribution_app
     SOURCES
     analyzedistribution.cpp
-    INSTALL bin
     DEPENDS
     storage
     AFTER
@@ -29,8 +26,7 @@ vespa_add_executable(storage_analyzedistribution_app
 vespa_add_executable(storage_storage-cmd_app
     SOURCES
     storage-cmd.cpp
-    OUTPUT_NAME storage-cmd
-    INSTALL bin
+    OUTPUT_NAME vespa-storage-cmd
     DEPENDS
     AFTER
     storage_storageconfig
@@ -38,7 +34,6 @@ vespa_add_executable(storage_storage-cmd_app
 vespa_add_executable(storage_throttlingsim_app
     SOURCES
     throttlingsim.cpp
-    INSTALL bin
     DEPENDS
     AFTER
     storage_storageconfig
@@ -46,7 +41,6 @@ vespa_add_executable(storage_throttlingsim_app
 vespa_add_executable(storage_statfs_app
     SOURCES
     statfs.cpp
-    INSTALL bin
     DEPENDS
     AFTER
     storage_storageconfig
diff --git a/storage/src/vespa/storage/tools/storage-cmd.cpp b/storage/src/vespa/storage/tools/storage-cmd.cpp
index e73376fcbe5..b9ead2be834 100644
--- a/storage/src/vespa/storage/tools/storage-cmd.cpp
+++ b/storage/src/vespa/storage/tools/storage-cmd.cpp
@@ -4,7 +4,7 @@
 #include <vespa/fastos/app.h>
 
 #include <vespa/log/log.h>
-LOG_SETUP("storage-cmd");
+LOG_SETUP("vespa-storage-cmd");
 
 class RPCClient : public FastOS_Application
 {
@@ -46,7 +46,7 @@ private:
 public:
     int Main() override {
         if (_argc < 3) {
-            fprintf(stderr, "usage: storage-cmd <connectspec> <method> [args]\n");
+            fprintf(stderr, "usage: vespa-storage-cmd <connectspec> <method> [args]\n");
             fprintf(stderr, "Calls RPC method on a storage/distributor process\n");
             fprintf(stderr, "Call frt.rpc.getMethodList to get available RPC methods\n");
             fprintf(stderr, "    each arg must be on the form <type>:<value>\n");