summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-10-09 08:05:47 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-10-09 08:05:47 +0200
commit639b0c01e2ac37ed8c955d51ed152a2325ec4bd4 (patch)
treea5c6ad7a64be0b22a672c3588728e9760cc18979 /controller-api
parentb2fac3c674ec6d5c9543247dde25acf7bb79420f (diff)
Move rotationId and globalRotations to instance level in application response
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java4
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstancesReply.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java
index 271deb6fe35..f9443e93f52 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstanceReference.java
@@ -6,6 +6,7 @@ import com.yahoo.vespa.hosted.controller.api.identifiers.InstanceId;
import java.net.URI;
import java.util.List;
+import java.util.Set;
/**
* @author mortent
@@ -15,7 +16,8 @@ public class InstanceReference {
public List<DeploymentReference> deployments;
public InstanceId instance;
-
+ public Set<URI> globalRotations;
+ public String rotationId;
public URI url;
}
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstancesReply.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstancesReply.java
index ebacafd75c4..c063c339406 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstancesReply.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/InstancesReply.java
@@ -12,8 +12,6 @@ import java.util.Set;
*/
@JsonIgnoreProperties(ignoreUnknown = true)
public class InstancesReply {
- public Set<URI> globalRotations;
public List<InstanceReference> instances;
public String compileVersion;
- public String rotationId;
}