diff options
| author | Martin Polden <mpolden@mpolden.no> | 2017-06-02 09:03:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-02 09:03:26 +0200 |
| commit | 138aac96a5f6d615eeabe426569b7303a673a02a (patch) | |
| tree | 3b07f01a38e4c124eaa549f10c2a7da56358cea3 /config-model/src/main/java/com | |
| parent | 439bc3fef0b6ce3ec5cee9ed85e61a8a50dc1bdf (diff) | |
| parent | 34174157360ed81f8b3bbefda37032332fa4cfe6 (diff) | |
Merge pull request #2604 from yahoo/bratseth/deployment-delay
Bratseth/deployment delay
Diffstat (limited to 'config-model/src/main/java/com')
| -rwxr-xr-x | config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java | 6 |
1 files changed, 3 insertions, 3 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 addf14d5e6b..0eb1abda713 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 @@ -418,10 +418,10 @@ public final class ContainerCluster private boolean zoneHasActiveRotation(Zone zone) { return getDeploymentSpec() - .flatMap(spec -> spec.zones().stream() - .filter(dz -> dz.matches(zone.environment(), Optional.of(zone.region()))) + .flatMap(spec -> spec.steps().stream() + .filter(dz -> dz.deploysTo(zone.environment(), Optional.of(zone.region()))) .findFirst()) - .map(DeploymentSpec.DeclaredZone::active) + .map(step -> ((DeploymentSpec.ZoneDeployment)step).active()) .orElse(false); } |