Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2580611D9C for ; Fri, 29 Aug 2014 02:07:36 +0000 (UTC) Received: (qmail 61510 invoked by uid 500); 29 Aug 2014 02:07:30 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 61365 invoked by uid 500); 29 Aug 2014 02:07:30 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 60520 invoked by uid 99); 29 Aug 2014 02:07:30 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Aug 2014 02:07:30 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 43E7295651A; Fri, 29 Aug 2014 02:07:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Fri, 29 Aug 2014 02:07:35 -0000 Message-Id: <904edc7285674e9caae62f19e7e782fd@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/12] git commit: HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. Contributed by Lei Xu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7119bd49 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7119bd49 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7119bd49 Branch: refs/heads/HDFS-6581 Commit: 7119bd49c870cf1e6b8c091d87025b439b9468df Parents: ab638e7 Author: Andrew Wang Authored: Thu Aug 28 17:39:50 2014 -0700 Committer: Andrew Wang Committed: Thu Aug 28 17:40:55 2014 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/conf/ReconfigurationServlet.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7119bd49/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 9fb0cd3..05eb383 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -468,6 +468,9 @@ Release 2.6.0 - UNRELEASED HADOOP-10880. Move HTTP delegation tokens out of URL querystring to a header. (tucu) + HADOOP-11005. Fix HTTP content type for ReconfigurationServlet. + (Lei Xu via wang) + OPTIMIZATIONS HADOOP-10838. Byte array native checksumming. (James Thomas via todd) http://git-wip-us.apache.org/repos/asf/hadoop/blob/7119bd49/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java index 3fa162b..eb1fb6b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/ReconfigurationServlet.java @@ -200,6 +200,7 @@ public class ReconfigurationServlet extends HttpServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { LOG.info("GET"); + resp.setContentType("text/html"); PrintWriter out = resp.getWriter(); Reconfigurable reconf = getReconfigurable(req); @@ -214,6 +215,7 @@ public class ReconfigurationServlet extends HttpServlet { protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { LOG.info("POST"); + resp.setContentType("text/html"); PrintWriter out = resp.getWriter(); Reconfigurable reconf = getReconfigurable(req);