summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2017-09-22 20:13:39 +0200
committerGitHub <noreply@github.com>2017-09-22 20:13:39 +0200
commit5d049e3cff73ccc7b6fc0e7259db0f3238592997 (patch)
tree4738225b5fd79d5e780775a10f52a72273b0a192 /config-model
parent33720727a40c18ba3be652bdaba7b0809eb3d606 (diff)
Revert "Freva/node admin shutdown"
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 40e997a0d81..32a9158dbcf 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
@@ -217,7 +217,6 @@ public final class ContainerCluster
addSimpleComponent(AccessLog.class);
// TODO better modelling
addSimpleComponent(ThreadPoolProvider.class);
- addSimpleComponent(com.yahoo.concurrent.lock.Locking.class);
addSimpleComponent("com.yahoo.jdisc.http.filter.SecurityFilterInvoker");
addSimpleComponent(SIMPLE_LINGUISTICS_PROVIDER);
addSimpleComponent("com.yahoo.container.jdisc.SslKeyStoreFactoryProvider");