Do not support vespa_base.<setting> anymore

Undocumented, has not been used for many years

2 files changed, 2 insertions, 8 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);