summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@oath.com>2019-01-28 10:01:46 +0100
committerGitHub <noreply@github.com>2019-01-28 10:01:46 +0100
commit7ab7ef084c10547ad1e3456144d769c53849d7e0 (patch)
tree273dda3ce65518c7d1d6f1e15875e378ac105d27
parentf186d70dba32e38adee972ffafed2a499b062e7d (diff)
parentc5c0495f7df2d12497e3289fc3840a1582b4412d (diff)
Merge pull request #8249 from vespa-engine/revert-8243-hakonhall/preserve-servicestatus-in-service-instance-for-backwards-compatibility
Revert "Preserve serviceStatus in service instance for backwards compatibility"
-rw-r--r--application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java
index 2ca900af956..b4fce878b0d 100644
--- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java
+++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceInstance.java
@@ -37,8 +37,6 @@ public class ServiceInstance {
return hostName;
}
- // For backwards compatibility, remove once all clients use serviceStatusInfo (convergence checker)
- @JsonProperty("serviceStatus")
public ServiceStatus serviceStatus() {
return serviceStatusInfo.serviceStatus();
}