diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-08-29 13:12:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 13:12:23 +0200 |
| commit | 4b4ee6503ad05926218b9a0d01a6ac0846bdf71c (patch) | |
| tree | 4b159f5e9df97d03669c0074a3ac836c9c13ac39 /controller-server | |
| parent | e9aa29d6d64ef15e6416d89f1f75470b5e567876 (diff) | |
| parent | 6abe06fa7850cdfdcd0b13ae8ef4fad6931877d9 (diff) | |
Merge pull request #6712 from vespa-engine/mpolden/clear-os-target
Allow clearing target OS version
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java index 11286acda3a..2decbe54cb0 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ControllerContainerTest.java @@ -43,6 +43,9 @@ public class ControllerContainerTest { private final String controllerServicesXml = "<jdisc version='1.0'>\n" + + " <config name=\"container.handler.threadpool\">\n" + + " <maxthreads>10</maxthreads>\n" + + " </config> \n" + " <config name='vespa.hosted.zone.config.zone'>\n" + " <system>main</system>\n" + " </config>\n" + |