summaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-02-10 07:21:40 +0100
committerHarald Musum <musum@oath.com>2018-02-10 07:21:40 +0100
commit2bc5541ab8e40aafaf2335cb57d04c4395552fa4 (patch)
tree35f3a3465006638cb51d7594f7bf2a81448b389c /config-model/src/test/java/com
parentead0a8b621cc85b67f454f2fbc089dcb5cf48fee (diff)
disableFiledistributor is not used anymore
Diffstat (limited to 'config-model/src/test/java/com')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java1
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java4
2 files changed, 0 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
index 01e1a0ba9fa..ad35eff6467 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/AdminTestCase.java
@@ -306,7 +306,6 @@ public class AdminTestCase {
@Test
public void testDisableFileDistributorForAllApps() {
DeployState state = new DeployState.Builder()
- .disableFiledistributor(true)
.properties(
new DeployProperties.Builder().
zone(new Zone(Environment.dev, RegionName.from("baz"))).
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
index 1784fe0e974..c698e9f5079 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/configserver/TestOptions.java
@@ -19,7 +19,6 @@ public class TestOptions implements CloudConfigOptions {
private Optional<Boolean> useVespaVersionInRequest = Optional.empty();
private Optional<Boolean> hostedVespa = Optional.empty();
private Optional<Integer> numParallelTenantLoaders = Optional.empty();
- private Optional<Boolean> disableFiledistributor = Optional.empty();
@Override
public Optional<Integer> rpcPort() {
@@ -118,9 +117,6 @@ public class TestOptions implements CloudConfigOptions {
@Override
public Optional<String> loadBalancerAddress() { return Optional.empty(); }
- @Override
- public Optional<Boolean> disableFiledistributor() { return disableFiledistributor; }
-
public TestOptions numParallelTenantLoaders(int numLoaders) {
this.numParallelTenantLoaders = Optional.of(numLoaders);
return this;