diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-10-09 13:35:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-09 13:35:34 +0200 |
| commit | 5323416bbb7c754acb446c0b4a3bbf07c33e785f (patch) | |
| tree | af8e8356b46c4a269faf3353dc7ef76aa7df9499 /config-model | |
| parent | a9516bbd206d26180d9bc6f0ab080588b4ca52a0 (diff) | |
| parent | da264051b2bf2160bc94c1121c59e56bcc678ab7 (diff) | |
Merge pull request #3681 from vespa-engine/bjorncs/bouncycastle
Open-source PEM keystore for JDisc
Diffstat (limited to 'config-model')
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 1 |
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"); |