diff options
author | gjoranv <gv@verizonmedia.com> | 2019-07-11 12:37:04 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-07-11 12:37:04 +0200 |
commit | 423a9f5e4bf1188659234f31c49dcf224505cbe6 (patch) | |
tree | 1c896b1edf0f4134d9f41b9e0a1e7733a14c1075 /node-repository | |
parent | fb2e54e7d204e892d6623889e8521b04b74b76df (diff) |
Replace 'jdisc' with 'container' in node-repository
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java | 4 | ||||
-rw-r--r-- | node-repository/src/test/resources/services.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java index 71a9cfa4985..888b8835e49 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java @@ -10,7 +10,7 @@ package com.yahoo.vespa.hosted.provision.testutils; public class ContainerConfig { public static String servicesXmlV2(int port) { - return "<jdisc version='1.0'>\n" + + return "<container version='1.0'>\n" + " <config name=\"container.handler.threadpool\">\n" + " <maxthreads>20</maxthreads>\n" + " </config> \n" + @@ -38,7 +38,7 @@ public class ContainerConfig { " <http>\n" + " <server id='myServer' port='" + port + "'/>\n" + " </http>\n" + - "</jdisc>"; + "</container>"; } } diff --git a/node-repository/src/test/resources/services.xml b/node-repository/src/test/resources/services.xml index b5702003d9e..7f9597b9c2f 100644 --- a/node-repository/src/test/resources/services.xml +++ b/node-repository/src/test/resources/services.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <services version="1.0"> - <jdisc version="1.0" id="default"> + <container version="1.0" id="default"> <nodes> <node hostalias="myhostalias1"/> <node hostalias="myhostalias2"/> </nodes> - </jdisc> + </container> <content version="1.0"> <!-- id="default" --> <nodes> <node hostalias="myhostalias3" distribution-key="99"/> <!-- arbitrary distribution keys --> |