Repository: falcon Updated Branches: refs/heads/master 25f423ce9 -> 368fe538e
FALCON-2287 Extension list fails with MIME type error on server Author: Pracheer Agarwal <[email protected]> Author: Pracheer Agarwal <[email protected]> Author: Pracheer <[email protected]> Author: Pracheer Agarwal <[email protected]> Reviewers: @pallavi-rao Closes #369 from PracheerAgarwal/FALCON-2287 and squashes the following commits: f8603ad [Pracheer] FALCON-2287 Extension list fails with MIME type error on server fc6ef2b [Pracheer] Merge branch 'master' of https://github.com/apache/falcon 7814fba [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon ba60452 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon ed65aa0 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 9ff05df [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 9c2f0a5 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 9cd8c17 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 778c579 [Pracheer Agarwal] Merge branch 'master' of https://github.com/PracheerAgarwal/falcon e39808d [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon a932633 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon fda3b28 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon a93d71a [Pracheer Agarwal] Merge branch 'master' of https://github.com/PracheerAgarwal/falcon e3728d5 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 066c8e2 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon b20f044 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 7f572a1 [Pracheer Agarwal] Merge branch 'master' of https://github.com/apache/falcon 46042fd [Pracheer Agarwal] Merge branch 'master' of https://github.com/PracheerAgarwal/falcon daa3ffc [Pracheer Agarwal] FALCON-2225 extension owner added for trusted extensions 622cae4 [Pracheer Agarwal] FALCON-2225 extension owner added for trusted extensions Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/368fe538 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/368fe538 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/368fe538 Branch: refs/heads/master Commit: 368fe538ea8cb6b60f89e4300852bb130bd201cd Parents: 25f423c Author: Pracheer Agarwal <[email protected]> Authored: Tue Feb 28 11:12:06 2017 +0530 Committer: Pallavi Rao <[email protected]> Committed: Tue Feb 28 11:12:06 2017 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/falcon/resource/ExtensionManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/368fe538/webapp/src/main/java/org/apache/falcon/resource/ExtensionManager.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/falcon/resource/ExtensionManager.java b/webapp/src/main/java/org/apache/falcon/resource/ExtensionManager.java index 78ddba0..87fb7ee 100644 --- a/webapp/src/main/java/org/apache/falcon/resource/ExtensionManager.java +++ b/webapp/src/main/java/org/apache/falcon/resource/ExtensionManager.java @@ -102,7 +102,7 @@ public class ExtensionManager extends AbstractExtensionManager { } @GET - @Path("list/{extension-name}") + @Path("list{extension-name : (/[^/]+)?}") @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_JSON}) public ExtensionJobList getExtensionJobs( @PathParam("extension-name") String extensionName,
