diff options
| author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-11-23 16:19:20 +0100 |
|---|---|---|
| committer | Øyvind Grønnesby <oyving@verizonmedia.com> | 2021-11-23 16:19:20 +0100 |
| commit | cd91614db66b12e84293b8ba938cf2103aa95b28 (patch) | |
| tree | 0ce87ab3b7bd57e9f13aec9fdae2a56baeb6d22b /controller-api/src | |
| parent | b342a8edb3c9ce28d53abbf89f70c1c3900a9db0 (diff) | |
| parent | baa10a7a7762766d4b32d484bc21283cac543993 (diff) | |
Merge remote-tracking branch 'origin/master' into ogronnesby/supported-plans
Diffstat (limited to 'controller-api/src')
| -rw-r--r-- | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/EndpointStatus.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/EndpointStatus.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/EndpointStatus.java index 55a7af45fd2..2f1b93158ab 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/EndpointStatus.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/EndpointStatus.java @@ -50,9 +50,10 @@ public class EndpointStatus { } /** - * @return The epoch for when this status became active + * @return The epoch for when this status became active, in seconds */ public long getEpoch() { return epoch; } + } |