commit | f0a678089a306f282e52adc777b8d0aaa31d95ca | [log] [tgz] |
---|---|---|
author | Pracheer Agarwal <pracheer.agarwal@inmobi.com> | Tue Feb 28 11:12:06 2017 +0530 |
committer | Pallavi Rao <pallavi.rao@inmobi.com> | Tue Feb 28 11:12:24 2017 +0530 |
tree | 9a263cd5f9c675ea450cfac9f6bfb40c5233949a | |
parent | 06f5fa5bef16145418780b30ff2a7cb8a8e5eb1b [diff] |
FALCON-2287 Extension list fails with MIME type error on server Author: Pracheer Agarwal <pracheer.agarwal@inmobi.com> Author: Pracheer Agarwal <pracheeragarwal@gmail.com> Author: Pracheer <pracheer@cheer.corp.inmobi.com> Author: Pracheer Agarwal <pr@im2216-x0.corp.inmobi.com> 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 (cherry picked from commit 368fe538ea8cb6b60f89e4300852bb130bd201cd) Signed-off-by: Pallavi Rao <pallavi.rao@inmobi.com>
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 @@ } @GET - @Path("list/{extension-name}") + @Path("list{extension-name : (/[^/]+)?}") @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_JSON}) public ExtensionJobList getExtensionJobs( @PathParam("extension-name") String extensionName,