Hadoop Common
  1. Hadoop Common
  2. HADOOP-7448

merge for MR-279: HttpServer /stacks servlet should use plain text content type

    Details

    • Type: Improvement Improvement
    • Status: Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 0.23.0
    • Fix Version/s: 0.23.0
    • Component/s: None
    • Labels:
      None

      Description

      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)

        Activity

        Matt Foley created issue -
        Matt Foley made changes -
        Field Original Value New Value
        Summary merge from yahoo-merge: HttpServer /stacks servlet should use plain text content type merge for MR-279: HttpServer /stacks servlet should use plain text content type
        Description Fix incomplete merge from yahoo-merge branch:
        -r 1079157: Fix content type for /stacks servlet (Luke Lu)
        -r 1079164: No need to escape plain text (Luke Lu)
        Fix incomplete merge from yahoo-merge branch to MR-279 branch:
        -r 1079157: Fix content type for /stacks servlet (Luke Lu)
        -r 1079164: No need to escape plain text (Luke Lu)
        Matt Foley made changes -
        Attachment HttpServlet_stacks_v1.patch [ 12485500 ]
        Matt Foley made changes -
        Status Open [ 1 ] Patch Available [ 10002 ]
        Hide
        Luke Lu added a comment -

        It seems to me that MR-279 already have the necessary changes.

        Show
        Luke Lu added a comment - It seems to me that MR-279 already have the necessary changes.
        Hide
        Luke Lu added a comment -

        +1 for trunk.

        Show
        Luke Lu added a comment - +1 for trunk.
        Hide
        Luke Lu added a comment -

        It'd be less confusing, if you create an umbrella jira for "Merge required common changes to trunk to get ready for MR-279", or something like that.

        Show
        Luke Lu added a comment - It'd be less confusing, if you create an umbrella jira for "Merge required common changes to trunk to get ready for MR-279", or something like that.
        Matt Foley made changes -
        Description Fix incomplete merge from yahoo-merge branch to MR-279 branch:
        -r 1079157: Fix content type for /stacks servlet (Luke Lu)
        -r 1079164: No need to escape plain text (Luke Lu)
        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)
        Hide
        Hadoop QA added a comment -

        -1 overall. Here are the results of testing the latest attachment
        http://issues.apache.org/jira/secure/attachment/12485500/HttpServlet_stacks_v1.patch
        against trunk revision 1143606.

        +1 @author. The patch does not contain any @author tags.

        +1 tests included. The patch appears to include 3 new or modified tests.

        +1 javadoc. The javadoc tool did not generate any warning messages.

        +1 javac. The applied patch does not increase the total number of javac compiler warnings.

        +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings.

        -1 release audit. The applied patch generated 4 release audit warnings (more than the trunk's current 1 warnings).

        +1 core tests. The patch passed core unit tests.

        +1 system test framework. The patch passed system test framework compile.

        Test results: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//testReport/
        Release audit warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//artifact/trunk/patchprocess/patchReleaseAuditProblems.txt
        Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html
        Console output: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//console

        This message is automatically generated.

        Show
        Hadoop QA added a comment - -1 overall. Here are the results of testing the latest attachment http://issues.apache.org/jira/secure/attachment/12485500/HttpServlet_stacks_v1.patch against trunk revision 1143606. +1 @author. The patch does not contain any @author tags. +1 tests included. The patch appears to include 3 new or modified tests. +1 javadoc. The javadoc tool did not generate any warning messages. +1 javac. The applied patch does not increase the total number of javac compiler warnings. +1 findbugs. The patch does not introduce any new Findbugs (version 1.3.9) warnings. -1 release audit. The applied patch generated 4 release audit warnings (more than the trunk's current 1 warnings). +1 core tests. The patch passed core unit tests. +1 system test framework. The patch passed system test framework compile. Test results: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//testReport/ Release audit warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//artifact/trunk/patchprocess/patchReleaseAuditProblems.txt Findbugs warnings: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//artifact/trunk/build/test/findbugs/newPatchFindbugsWarnings.html Console output: https://builds.apache.org/job/PreCommit-HADOOP-Build/705//console This message is automatically generated.
        Hide
        Matt Foley added a comment -

        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.

        Show
        Matt Foley added a comment - 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.
        Matt Foley made changes -
        Status Patch Available [ 10002 ] Resolved [ 5 ]
        Resolution Fixed [ 1 ]
        Hide
        Matt Foley added a comment -

        Hudson came back! The four release audit warnings are not related to this merge. Passed everything else.

        Show
        Matt Foley added a comment - Hudson came back! The four release audit warnings are not related to this merge. Passed everything else.
        Hide
        Hudson added a comment -

        Integrated in Hadoop-Common-trunk-Commit #678 (See https://builds.apache.org/job/Hadoop-Common-trunk-Commit/678/)
        HADOOP-7448. Merge from yahoo-merge branch -r 1079157 and -r 1079164: HttpServer /stacks servlet should use plain text content type, without escaping. Contributed by Luke Lu.

        mattf : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1143613
        Files :

        • /hadoop/common/trunk/common/src/java/org/apache/hadoop/http/HttpServer.java
        • /hadoop/common/trunk/common/CHANGES.txt
        • /hadoop/common/trunk/common/src/test/core/org/apache/hadoop/http/TestHttpServer.java
        Show
        Hudson added a comment - Integrated in Hadoop-Common-trunk-Commit #678 (See https://builds.apache.org/job/Hadoop-Common-trunk-Commit/678/ ) HADOOP-7448 . Merge from yahoo-merge branch -r 1079157 and -r 1079164: HttpServer /stacks servlet should use plain text content type, without escaping. Contributed by Luke Lu. mattf : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1143613 Files : /hadoop/common/trunk/common/src/java/org/apache/hadoop/http/HttpServer.java /hadoop/common/trunk/common/CHANGES.txt /hadoop/common/trunk/common/src/test/core/org/apache/hadoop/http/TestHttpServer.java
        Hide
        Hudson added a comment -

        Integrated in Hadoop-Common-trunk #740 (See https://builds.apache.org/job/Hadoop-Common-trunk/740/)
        HADOOP-7448. Merge from yahoo-merge branch -r 1079157 and -r 1079164: HttpServer /stacks servlet should use plain text content type, without escaping. Contributed by Luke Lu.

        mattf : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1143613
        Files :

        • /hadoop/common/trunk/common/src/java/org/apache/hadoop/http/HttpServer.java
        • /hadoop/common/trunk/common/CHANGES.txt
        • /hadoop/common/trunk/common/src/test/core/org/apache/hadoop/http/TestHttpServer.java
        Show
        Hudson added a comment - Integrated in Hadoop-Common-trunk #740 (See https://builds.apache.org/job/Hadoop-Common-trunk/740/ ) HADOOP-7448 . Merge from yahoo-merge branch -r 1079157 and -r 1079164: HttpServer /stacks servlet should use plain text content type, without escaping. Contributed by Luke Lu. mattf : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVN&view=rev&rev=1143613 Files : /hadoop/common/trunk/common/src/java/org/apache/hadoop/http/HttpServer.java /hadoop/common/trunk/common/CHANGES.txt /hadoop/common/trunk/common/src/test/core/org/apache/hadoop/http/TestHttpServer.java
        Arun C Murthy made changes -
        Status Resolved [ 5 ] Closed [ 6 ]

          People

          • Assignee:
            Matt Foley
            Reporter:
            Matt Foley
          • Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development