summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2017-10-19 14:45:28 +0200
committerGitHub <noreply@github.com>2017-10-19 14:45:28 +0200
commitdca1e05b7a15a3a0ae8f1b5f8b533eb990be1a96 (patch)
tree647ab6e3a682dbf8ab33a3981886a44a2edf6244 /config-model
parent4aebf696cdf02151b993f407666acb7690932116 (diff)
Revert "Add back SslKeyStoreFactoryProvider as a temporary workaround"
Diffstat (limited to 'config-model')
-rwxr-xr-xconfig-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
index 77029360593..4eb611a1dbe 100755
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java
@@ -220,7 +220,6 @@ public final class ContainerCluster
addSimpleComponent(com.yahoo.concurrent.classlock.ClassLocking.class);
addSimpleComponent("com.yahoo.jdisc.http.filter.SecurityFilterInvoker");
addSimpleComponent(SIMPLE_LINGUISTICS_PROVIDER);
- addSimpleComponent("com.yahoo.container.jdisc.SslKeyStoreFactoryProvider");
addSimpleComponent("com.yahoo.container.jdisc.SecretStoreProvider");
addSimpleComponent("com.yahoo.container.jdisc.CertificateStoreProvider");
addSimpleComponent("com.yahoo.container.jdisc.metric.MetricConsumerProviderProvider");