You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pa...@apache.org on 2017/10/23 05:52:42 UTC
[08/26] falcon git commit: FALCON-2287 Extension list fails with MIME
type error on server
FALCON-2287 Extension list fails with MIME type error on server
Author: Pracheer Agarwal <pr...@inmobi.com>
Author: Pracheer Agarwal <pr...@gmail.com>
Author: Pracheer <pr...@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 <pa...@inmobi.com>
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/f0a67808
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/f0a67808
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/f0a67808
Branch: refs/heads/master
Commit: f0a678089a306f282e52adc777b8d0aaa31d95ca
Parents: 06f5fa5
Author: Pracheer Agarwal <pr...@inmobi.com>
Authored: Tue Feb 28 11:12:06 2017 +0530
Committer: Pallavi Rao <pa...@inmobi.com>
Committed: Tue Feb 28 11:12:24 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/f0a67808/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,