diff options
| author | Harald Musum <musum@oath.com> | 2017-08-31 09:32:49 +0200 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2017-08-31 09:32:49 +0200 |
| commit | 9f506465b36ef1b7a858211882fc3594d170b418 (patch) | |
| tree | 5599ed86e4cee0fcb0dd696572b8d038b361b5c2 /configserver | |
| parent | e4dc0493754618dd33ddf8985d0ddd23001a9d39 (diff) | |
| parent | 0c7af1343cec5ca95e338ce83dda158f123e72dc (diff) | |
Merge branch 'master' into revert-3275-revert-3260-hmusum/remove-version-from-def-files
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java index 377b3997e43..70be29fa80d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java @@ -51,14 +51,12 @@ import java.util.logging.Logger; * @author Vegard Havdal * @author Ulf Lilleengen */ -//TODO Rename to TenantRepository +// TODO: Rename to TenantRepository public class Tenants implements ConnectionStateListener, PathChildrenCacheListener { public static final TenantName HOSTED_VESPA_TENANT = TenantName.from("hosted-vespa"); private static final TenantName DEFAULT_TENANT = TenantName.defaultName(); - private static final List<TenantName> SYSTEM_TENANT_NAMES = Arrays.asList( - DEFAULT_TENANT, - HOSTED_VESPA_TENANT); + private static final List<TenantName> SYSTEM_TENANT_NAMES = Arrays.asList(DEFAULT_TENANT, HOSTED_VESPA_TENANT); private static final Path tenantsPath = Path.fromString("/config/v2/tenants/"); private static final Path vespaPath = Path.fromString("/vespa"); |