diff options
5 files changed, 3 insertions, 14 deletions
diff --git a/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl index 014d9be8085..7568ac13780 100755 --- a/config/src/apps/vespa-config/vespa-config.pl +++ b/config/src/apps/vespa-config/vespa-config.pl @@ -148,19 +148,13 @@ sub getServicesVar { my ($varname, $default, $warn) = @_; # print "GET var '$varname'\n"; my $cloud = getValue($varname, "services"); - my $vespa = getValue($varname, "vespa_base"); my $plain = $ENV{$varname}; - if (defined($cloud) && defined($vespa)) { - print STDERR "Found settings for both services.$varname and vespa_base.$varname, using settings from services\n"; - } if (defined($cloud)) { return $cloud; - } elsif (defined($vespa)) { - return $vespa; } elsif (defined($plain)) { return $plain; } elsif ($warn > 0) { - print STDERR "No value found for 'services.$varname' or 'vespa_base.$varname'; using '$default'\n"; + print STDERR "No value found for 'services.$varname'; using '$default'\n"; } return $default; } diff --git a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java index 5fcbd4f8c21..6bfaa992eb1 100644 --- a/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java +++ b/config/src/main/java/com/yahoo/config/subscription/ConfigSubscriber.java @@ -60,7 +60,7 @@ public class ConfigSubscriber implements AutoCloseable { /** * Constructs a new subscriber. The default Vespa network config source will be used, which is the address of - * a config proxy (part of vespa_base) running locally. It can also be changed by setting VESPA_CONFIG_SOURCES. + * a config proxy running locally. It can also be changed by setting VESPA_CONFIG_SOURCES. */ public ConfigSubscriber() { this(JRTConfigRequester.defaultSourceSet); diff --git a/defaults/src/vespa/defaults.cpp b/defaults/src/vespa/defaults.cpp index 24149e3e4c8..0ddd12d234e 100644 --- a/defaults/src/vespa/defaults.cpp +++ b/defaults/src/vespa/defaults.cpp @@ -121,9 +121,6 @@ const char *findConfigServers(const char *defServers) { env = getenv("services__addr_configserver"); } if (env == NULL || *env == '\0') { - env = getenv("vespa_base__addr_configserver"); - } - if (env == NULL || *env == '\0') { env = getenv("addr_configserver"); } if (env != NULL && *env != '\0') { diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java index 13c089a1093..7e14e94823b 100644 --- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java +++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileReferenceDownloader.java @@ -122,7 +122,7 @@ public class FileReferenceDownloader { log.log(Level.FINE, () -> "Found file reference '" + fileReference + "' available at " + connection.getAddress()); return true; } else { - log.log(logLevel, "File reference '" + fileReference + "' not found for " + connection.getAddress()); + log.log(logLevel, "File reference '" + fileReference + "' not found at " + connection.getAddress()); connectionPool.setNewCurrentConnection(); return false; } diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh index c6f2dff7656..011140b4633 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -65,11 +65,9 @@ get_var() { env_var_name=`echo $arg | tr '[:lower:]' '[:upper:]'` prefixed_var_name1=services__${arg} - prefixed_var_name2=vespa_base__${arg} if varhasvalue $env_var_name ; then eval "ret_val=\${$env_var_name}" elif varhasvalue $prefixed_var_name1 ; then eval "ret_val=\${$prefixed_var_name1}" - elif varhasvalue $prefixed_var_name2 ; then eval "ret_val=\${$prefixed_var_name2}" fi echo "$ret_val" } |