diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2018-01-14 07:41:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-14 07:41:46 +0100 |
| commit | 70bd4e6db954575c372dc924f5fc41d528f5583f (patch) | |
| tree | fbdc3cdf92e3ed3bb2c0b657586d9885010323a7 | |
| parent | 289c6630ede5c36871884193afda61fd91e69398 (diff) | |
Revert "Arnej/fix cmdline tools"
| -rw-r--r-- | config-model/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | configd/src/apps/su/main.cpp | 2 | ||||
| -rw-r--r-- | vespabase/CMakeLists.txt | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/config-model/CMakeLists.txt b/config-model/CMakeLists.txt index 16c0867e5d6..274ab8a763b 100644 --- a/config-model/CMakeLists.txt +++ b/config-model/CMakeLists.txt @@ -8,5 +8,3 @@ vespa_install_script(src/main/sh/vespa-validate-application bin) install(DIRECTORY src/main/resources/schema DESTINATION share/vespa PATTERN ".gitignore" EXCLUDE) install(DIRECTORY src/main/resources/schema DESTINATION share/vespa/schema/version/6.x PATTERN ".gitignore" EXCLUDE) - -install_java_artifact(jing) diff --git a/configd/src/apps/su/main.cpp b/configd/src/apps/su/main.cpp index ceecc71ae5a..c1cebd56c29 100644 --- a/configd/src/apps/su/main.cpp +++ b/configd/src/apps/su/main.cpp @@ -18,7 +18,7 @@ int main(int argc, char** argv) } const char *username = getenv("VESPA_USER"); if (username == nullptr) { - username = "vespa"; + username = "yahoo"; } struct passwd *p = getpwnam(username); if (p == nullptr) { diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index 2fd8ea2701f..ea007b130f9 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_install_script(src/start-cbinaries.sh vespa-config-status bin) vespa_install_script(src/start-cbinaries.sh vespa-doclocator bin) vespa_install_script(src/start-cbinaries.sh vespa-model-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-proton-cmd bin) +vespa_install_script(src/start-cbinaries.sh vespa-query-profile-dump-tool bin) vespa_install_script(src/start-cbinaries.sh vespa-route bin) vespa_install_script(src/start-cbinaries.sh vespa-transactionlog-inspect bin) vespa_install_script(src/start-cbinaries.sh vespa-vds-disktool bin) |