diff options
| author | Geir Storli <geirstorli@yahoo.no> | 2017-06-12 16:42:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 16:42:58 +0200 |
| commit | 55fbb498bffb6a5b53b988ddeb49e33a048e5029 (patch) | |
| tree | efa218628cdd85994b99308bbfb655aaadf64ca5 | |
| parent | 9f8401c9da6f038c797cf7b634a926b8c0ba01d1 (diff) | |
| parent | ea06f63fb0cdfa8adb4af217450d83405289f691 (diff) | |
Merge pull request #2713 from yahoo/toregge/rename-config-proxy-binaries
Rename config-proxy programs to have vespa- prefix.
| -rwxr-xr-x | config-proxy/src/main/sh/vespa-config-ctl (renamed from config-proxy/src/main/sh/config-ctl) | 0 | ||||
| -rw-r--r-- | config-proxy/src/main/sh/vespa-config-loadtester (renamed from config-proxy/src/main/sh/cloudconfig_loadtester) | 0 | ||||
| -rw-r--r-- | config-proxy/src/main/sh/vespa-config-verification (renamed from config-proxy/src/main/sh/cloudconfig_verification) | 0 | ||||
| -rw-r--r-- | install_java.cmake | 4 | ||||
| -rwxr-xr-x | vespabase/src/start-vespa-base.sh | 2 | ||||
| -rwxr-xr-x | vespabase/src/stop-vespa-base.sh | 2 |
6 files changed, 5 insertions, 3 deletions
diff --git a/config-proxy/src/main/sh/config-ctl b/config-proxy/src/main/sh/vespa-config-ctl index 7221ff0ee27..7221ff0ee27 100755 --- a/config-proxy/src/main/sh/config-ctl +++ b/config-proxy/src/main/sh/vespa-config-ctl diff --git a/config-proxy/src/main/sh/cloudconfig_loadtester b/config-proxy/src/main/sh/vespa-config-loadtester index 6efe70d570a..6efe70d570a 100644 --- a/config-proxy/src/main/sh/cloudconfig_loadtester +++ b/config-proxy/src/main/sh/vespa-config-loadtester diff --git a/config-proxy/src/main/sh/cloudconfig_verification b/config-proxy/src/main/sh/vespa-config-verification index 0df2723cee5..0df2723cee5 100644 --- a/config-proxy/src/main/sh/cloudconfig_verification +++ b/config-proxy/src/main/sh/vespa-config-verification diff --git a/install_java.cmake b/install_java.cmake index 450bbdd9b5e..4c6eb31bd8a 100644 --- a/install_java.cmake +++ b/install_java.cmake @@ -51,7 +51,9 @@ install_fat_java_artifact(zkfacade) vespa_install_script(application-preprocessor/src/main/sh/vespa-preprocess-application bin) vespa_install_script(jdisc_core/src/main/perl/jdisc_logfmt bin) -vespa_install_script(config-proxy/src/main/sh/config-ctl bin) +vespa_install_script(config-proxy/src/main/sh/vespa-config-ctl bin) +vespa_install_script(config-proxy/src/main/sh/vespa-config-loadtester bin) +vespa_install_script(config-proxy/src/main/sh/vespa-config-verification bin) vespa_install_script(config-model/src/main/perl/vespa-deploy bin) vespa_install_script(config-model/src/main/perl/vespa-deploy-application bin) vespa_install_script(config-model/src/main/perl/vespa-expand-config.pl bin) diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh index ad6b58f61b1..fc6353f842f 100755 --- a/vespabase/src/start-vespa-base.sh +++ b/vespabase/src/start-vespa-base.sh @@ -73,4 +73,4 @@ if [ -f /tmp/.ylock-arena.shm ]; then chown yahoo:wheel /tmp/.ylock-arena.shm fi -exec run-as-yahoo ${VESPA_HOME}/bin/config-ctl start +exec run-as-yahoo ${VESPA_HOME}/bin/vespa-config-ctl start diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh index 6e2fccc5664..efe4f71fe9f 100755 --- a/vespabase/src/stop-vespa-base.sh +++ b/vespabase/src/stop-vespa-base.sh @@ -64,4 +64,4 @@ cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; } fixlimits -exec run-as-yahoo ${VESPA_HOME}/bin/config-ctl stop +exec run-as-yahoo ${VESPA_HOME}/bin/vespa-config-ctl stop |