diff options
author | Harald Musum <musum@oath.com> | 2018-08-29 18:15:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-29 18:15:06 +0200 |
commit | dbc86be22dad1d9fb279d978a45e621a5325ca7e (patch) | |
tree | 511231f13151ee7f3b65dac3d9cbfe7cd41a14d7 | |
parent | f11f82fca0515bc943c22f73bad6f240ea7726d8 (diff) | |
parent | 8ab2f76cea0e9ec4982ef8c7225675991ce95899 (diff) |
Merge pull request #6724 from vespa-engine/revert-6710-hmusum/use-legacy-format-option-for-vespa-get-config
Revert "Explicitly use legacy format option to vespa-get-config"
-rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 2 | ||||
-rw-r--r-- | vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index 21c9dc28022..e6219ab0467 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -52,7 +52,7 @@ getconfig() { qrstartcfg="`cat ${config_dir}/qr-start.cfg`" ;; *) - qrstartcfg="`$VESPA_HOME/bin/vespa-get-config -l -w 10 -n search.config.qr-start -i ${VESPA_CONFIG_ID}`" + qrstartcfg="`$VESPA_HOME/bin/vespa-get-config -w 10 -n search.config.qr-start -i ${VESPA_CONFIG_ID}`" ;; esac cmds=`echo "$qrstartcfg" | perl -ne 's/^(\w+)\.(\w+) (.*)/$1_$2=$3/ && print'` diff --git a/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm b/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm index 18af0bbdecd..fd324540bba 100644 --- a/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm +++ b/vespaclient/src/perl/lib/Yahoo/Vespa/VespaModel.pm @@ -162,7 +162,7 @@ sub setModelRetrievalFunction { # (Function) } sub retrieveModelConfigDefault { # () my $VESPA_HOME= $ENV{'VESPA_HOME'}; - my $cmd = ${VESPA_HOME} . '/bin/vespa-get-config -l -n cloud.config.model -i admin/model'; + my $cmd = ${VESPA_HOME} . '/bin/vespa-get-config -n cloud.config.model -i admin/model'; if (defined $CONFIG_REQUEST_TIMEOUT) { $cmd .= " -w $CONFIG_REQUEST_TIMEOUT"; |