diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2018-01-13 17:13:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 17:13:01 +0100 |
| commit | 289c6630ede5c36871884193afda61fd91e69398 (patch) | |
| tree | 7b9e02c05e649d3a41e00a30ce73e9792c6879f2 | |
| parent | 1a0c107cb627068cd42656b828836e3cd4e68b34 (diff) | |
| parent | cb38428e20cec5f793d06e291e64f83d29776708 (diff) | |
Merge pull request #4625 from vespa-engine/arnej/fix-cmdline-tools
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, 3 insertions, 2 deletions
diff --git a/config-model/CMakeLists.txt b/config-model/CMakeLists.txt index 274ab8a763b..16c0867e5d6 100644 --- a/config-model/CMakeLists.txt +++ b/config-model/CMakeLists.txt @@ -8,3 +8,5 @@ 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 c1cebd56c29..ceecc71ae5a 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 = "yahoo"; + username = "vespa"; } struct passwd *p = getpwnam(username); if (p == nullptr) { diff --git a/vespabase/CMakeLists.txt b/vespabase/CMakeLists.txt index ea007b130f9..2fd8ea2701f 100644 --- a/vespabase/CMakeLists.txt +++ b/vespabase/CMakeLists.txt @@ -5,7 +5,6 @@ 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) |