HADOOP-7662. svn merge -c r1176849 --ignore-ancestry ../../trunk/
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1176852 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
e6f5bf6dd8
commit
0d329d55e9
|
@ -599,6 +599,9 @@ Release 0.23.0 - Unreleased
|
||||||
hadoop-common/src/main/packages/templates/conf/
|
hadoop-common/src/main/packages/templates/conf/
|
||||||
(Ravi Prakash via stevel)
|
(Ravi Prakash via stevel)
|
||||||
|
|
||||||
|
HADOOP-7662. Fixed logs servlet to use the pathspec '/*' instead of '/'
|
||||||
|
for correct filtering. (Thomas Graves via vinodkv)
|
||||||
|
|
||||||
Release 0.22.0 - Unreleased
|
Release 0.22.0 - Unreleased
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -282,7 +282,7 @@ public class HttpServer implements FilterContainer {
|
||||||
if (logDir != null) {
|
if (logDir != null) {
|
||||||
Context logContext = new Context(parent, "/logs");
|
Context logContext = new Context(parent, "/logs");
|
||||||
logContext.setResourceBase(logDir);
|
logContext.setResourceBase(logDir);
|
||||||
logContext.addServlet(AdminAuthorizedServlet.class, "/");
|
logContext.addServlet(AdminAuthorizedServlet.class, "/*");
|
||||||
logContext.setDisplayName("logs");
|
logContext.setDisplayName("logs");
|
||||||
setContextAttributes(logContext, conf);
|
setContextAttributes(logContext, conf);
|
||||||
defaultContexts.put(logContext, true);
|
defaultContexts.put(logContext, true);
|
||||||
|
|
Loading…
Reference in New Issue