diff options
| author | Harald Musum <musum@oath.com> | 2017-11-08 09:21:29 +0100 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2017-11-08 09:21:29 +0100 |
| commit | c90fa829e3593062ea397b6a8527178f7616d613 (patch) | |
| tree | b73df0983eddb9b5930b7fcc548af3e644e7c146 /config-model-api | |
| parent | 8fb495a3be28e17d3f712ab27f5723d96ed4bc70 (diff) | |
| parent | 92fd730ade0c311ad42a1ebaa0154ec115452707 (diff) | |
Merge branch 'master' into balder/add-filedist-rpc-to-configserver
Diffstat (limited to 'config-model-api')
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java | 3 | ||||
| -rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java | 4 |
2 files changed, 1 insertions, 6 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java index f46fe39e8c4..818f7498af4 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/DeploymentSpec.java @@ -90,9 +90,6 @@ public class DeploymentSpec { /** Adds missing required steps and reorders steps to a permissible order */ private static List<Step> completeSteps(List<Step> steps) { - // Ensure no duplicate deployments to the same zone - steps = new ArrayList<>(new LinkedHashSet<>(steps)); - // Add staging if required and missing if (steps.stream().anyMatch(step -> step.deploysTo(Environment.prod)) && steps.stream().noneMatch(step -> step.deploysTo(Environment.staging))) { diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java index 8bab2f83448..5050f88af31 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecTest.java @@ -97,12 +97,10 @@ public class DeploymentSpecTest { StringReader r = new StringReader( "<deployment version='1.0'>" + " <test/>" + - " <test/>" + " <staging/>" + " <prod>" + " <region active='false'>us-east1</region>" + - " <region active='false'>us-east1</region>" + - " <delay hours='3' minutes='30'/>" + + " <delay hours='3' minutes='30'/>" + " <region active='true'>us-west1</region>" + " </prod>" + "</deployment>" |