Author: enis Date: Fri Nov 23 05:54:20 2007 New Revision: 597666 URL: http://svn.apache.org/viewvc?rev=597666&view=rev Log: Merge -r 597662:597663 from trunk to branch 0.15. Fixes: HADOOP-2238.
Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/StatusHttpServer.java Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/CHANGES.txt?rev=597666&r1=597665&r2=597666&view=diff ============================================================================== --- lucene/hadoop/branches/branch-0.15/CHANGES.txt (original) +++ lucene/hadoop/branches/branch-0.15/CHANGES.txt Fri Nov 23 05:54:20 2007 @@ -38,6 +38,8 @@ HADOOP-2246. Moved the changelog for HADOOP-1851 from the NEW FEATURES section to the INCOMPATIBLE CHANGES section. (acmurthy) + HADOOP-2238. Fix TaskGraphServlet so that it sets the content type of + the response appropriately. (Paul Saab via enis) Release 0.15.0 - 2007-11-2 Modified: lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/StatusHttpServer.java URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/StatusHttpServer.java?rev=597666&r1=597665&r2=597666&view=diff ============================================================================== --- lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/StatusHttpServer.java (original) +++ lucene/hadoop/branches/branch-0.15/src/java/org/apache/hadoop/mapred/StatusHttpServer.java Fri Nov 23 05:54:20 2007 @@ -261,6 +261,8 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + response.setContentType("image/svg+xml"); + JobTracker tracker = (JobTracker) getServletContext().getAttribute("job.tracker");