Repository: falcon Updated Branches: refs/heads/master 51041fc4a -> 1416f5e70
FALCON-1317 Inconsistent JSON serialization. Contributed by Ajay Yadava Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/d1942f47 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/d1942f47 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/d1942f47 Branch: refs/heads/master Commit: d1942f4749208fea6d3247c13d211a3918445ed5 Parents: 51041fc Author: Ajay Yadava <[email protected]> Authored: Wed Jul 29 16:03:30 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Wed Jul 29 16:03:30 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../org/apache/falcon/resource/provider/JAXBContextResolver.java | 4 ++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/d1942f47/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 89e7263..13ea93f 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,8 @@ Trunk (Unreleased) FALCON-796 Enable users to triage data processing issues through falcon (Ajay Yadava) IMPROVEMENTS + FALCON-1317 Inconsistent JSON serialization(Ajay Yadava) + FALCON-1324 Pagination API breaks backward compatibility(Ajay Yadava). FALCON-668 FeedReplicator improvement to include more DistCP options(Sowmya Ramesh via Ajay Yadava) http://git-wip-us.apache.org/repos/asf/falcon/blob/d1942f47/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java b/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java index 4469e02..e8f3c14 100644 --- a/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java +++ b/prism/src/main/java/org/apache/falcon/resource/provider/JAXBContextResolver.java @@ -21,9 +21,11 @@ package org.apache.falcon.resource.provider; import com.sun.jersey.api.json.JSONConfiguration; import com.sun.jersey.api.json.JSONJAXBContext; import org.apache.falcon.resource.APIResult; +import org.apache.falcon.resource.InstanceDependencyResult; import org.apache.falcon.resource.InstancesResult; import org.apache.falcon.resource.InstancesSummaryResult; import org.apache.falcon.resource.InstancesSummaryResult.InstanceSummary; +import org.apache.falcon.resource.TriageResult; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; @@ -47,6 +49,8 @@ public class JAXBContextResolver implements ContextResolver<JAXBContext> { InstancesResult.WorkflowStatus.class, InstancesSummaryResult.class, InstanceSummary.class, + InstanceDependencyResult.class, + TriageResult.class, }; static {
