diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2017-06-08 14:31:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-08 14:31:15 +0200 |
| commit | e9db206c1a50fda586472b76aa58885bbb73c782 (patch) | |
| tree | 08814b6704a69af319e227960e14acc0919423e2 | |
| parent | be18022385f94cb99200f604cc6b8e3db1010e9d (diff) | |
| parent | 3944ddeedb93361304414a918ff7495bf3b8d971 (diff) | |
Merge pull request #2673 from yahoo/gjoranv/add-zone-to-container-config
Add a Zone component to services config.
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/ContainerConfig.java | 3 |
1 files changed, 2 insertions, 1 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 d383e90d184..b01949f4d8f 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 @@ -9,7 +9,7 @@ package com.yahoo.vespa.hosted.provision.testutils; */ public class ContainerConfig { - public static final String servicesXmlV2(int port) { + public static String servicesXmlV2(int port) { return "<jdisc version='1.0'>" + " <component id='com.yahoo.test.ManualClock'/>" + @@ -21,6 +21,7 @@ public class ContainerConfig { " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeFlavors'/>" + " <component id='com.yahoo.vespa.hosted.provision.testutils.MockNodeRepository'/>" + " <component id='com.yahoo.vespa.hosted.provision.maintenance.NodeRepositoryMaintenance'/>" + + " <component id='com.yahoo.config.provision.Zone'/>" + " <handler id='com.yahoo.vespa.hosted.provision.restapi.v2.NodesApiHandler'>" + " <binding>http://*/nodes/v2/*</binding>" + " </handler>" + |