[
https://issues.apache.org/jira/browse/HADOOP-7448?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Matt Foley updated HADOOP-7448:
-------------------------------
Resolution: Fixed
Status: Resolved (was: Patch Available)
Hudson is not responding, so ran tests locally, and passed.
The merge required a conflict resolution, so I posted the resulting patch here.
But committing as a merge so full history is available in the svn record.
Committed to trunk.
> merge for MR-279: HttpServer /stacks servlet should use plain text content
> type
> -------------------------------------------------------------------------------
>
> Key: HADOOP-7448
> URL: https://issues.apache.org/jira/browse/HADOOP-7448
> Project: Hadoop Common
> Issue Type: Improvement
> Affects Versions: 0.23.0
> Reporter: Matt Foley
> Assignee: Matt Foley
> Fix For: 0.23.0
>
> Attachments: HttpServlet_stacks_v1.patch
>
>
> Fix incomplete merge from yahoo-merge branch to trunk:
> -r 1079157: Fix content type for /stacks servlet (Luke Lu)
> -r 1079164: No need to escape plain text (Luke Lu)
--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira
