You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2016/02/11 20:13:25 UTC
[3/5] brooklyn-server git commit: restore TaskSummary field names
isError and isCancelled
restore TaskSummary field names isError and isCancelled
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/14bd3402
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/14bd3402
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/14bd3402
Branch: refs/heads/master
Commit: 14bd34023dd8dad350290404766831f79f4838db
Parents: 5b01f8f
Author: Andrea Turli <an...@gmail.com>
Authored: Thu Feb 11 17:31:11 2016 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Thu Feb 11 18:22:16 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/brooklyn/rest/domain/TaskSummary.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/14bd3402/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
index 6de384e..4df5027 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/domain/TaskSummary.java
@@ -82,8 +82,8 @@ public class TaskSummary implements HasId, Serializable {
@JsonProperty("endTimeUtc") Long endTimeUtc,
@JsonProperty("currentStatus") String currentStatus,
@JsonProperty("result") Object result,
- @JsonProperty("error") boolean error,
- @JsonProperty("cancelled") boolean cancelled,
+ @JsonProperty("IsError") boolean error,
+ @JsonProperty("isCancelled") boolean cancelled,
@JsonProperty("children") List<LinkWithMetadata> children,
@JsonProperty("submittedByTask") LinkWithMetadata submittedByTask,
@JsonProperty("blockingTask") LinkWithMetadata blockingTask,