diff options
| author | gjoranv <gjoranv@gmail.com> | 2018-04-09 11:06:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 11:06:42 +0200 |
| commit | 3fc32569e36f4eaae9232e37cfc684dbe912532e (patch) | |
| tree | aa7041de1c8d9129f75e9564af6b31fcc10aa871 /config-model | |
| parent | 4db074eaaef0856e40daf86b534abe9dcafa8ba6 (diff) | |
| parent | ac18b7458fd30f81909a722ac878af5fde7fabe1 (diff) | |
Merge pull request #5484 from vespa-engine/bratseth/nonfunctional-changes
Nonfunctional changes
Diffstat (limited to 'config-model')
3 files changed, 3 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java index 542f50247a7..61a5db04ca7 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/Hosts.java @@ -77,7 +77,7 @@ public class Hosts { if ("localhost".equals(name)) { name = HostName.getLocalhost(); } - final List<String> hostAliases = VespaDomBuilder.getHostAliases(hostE.getChildNodes()); + List<String> hostAliases = VespaDomBuilder.getHostAliases(hostE.getChildNodes()); if (hostAliases.isEmpty()) { throw new IllegalArgumentException("No host aliases defined for host '" + name + "'"); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java index 72309d4c266..0f7c040bf02 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/HostResource.java @@ -105,7 +105,7 @@ public class HostResource implements Comparable<HostResource> { if (wantedPort > 0) { if (service.getPortCount() < 1) { throw new RuntimeException(service + " wants baseport " + wantedPort + - ", but it has not reserved any ports, so it cannot name a desired baseport."); + ", but it has not reserved any ports, so it cannot name a desired baseport."); } if (service.requiresWantedPort() || canUseWantedPort(service, wantedPort, serviceBasePort)) serviceBasePort = wantedPort; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java index 8cdf9ba4977..cdd90ae1a36 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/configserver/ConfigserverCluster.java @@ -22,8 +22,7 @@ import java.util.Optional; /** * Represents a config server cluster. * - * @author lulf - * @since 5.15 + * @author Ulf Lilleengen */ public class ConfigserverCluster extends AbstractConfigProducer implements |