Repository: hadoop Updated Branches: refs/heads/branch-2 a33cdfb87 -> 3e80aece2
HADOOP-12710. Remove dependency on commons-httpclient for TestHttpServerLogs (Wei-Chiu Chuang via iwasakims) (cherry picked from commit 1a1c2f5bab522ed39a35edbca30e6bed5a990992) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e80aece Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e80aece Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e80aece Branch: refs/heads/branch-2 Commit: 3e80aece2eb651f3ecf084a894ccb3e954867dee Parents: a33cdfb Author: Masatake Iwasaki <[email protected]> Authored: Thu Feb 18 00:13:11 2016 +0900 Committer: Masatake Iwasaki <[email protected]> Committed: Thu Feb 18 00:25:20 2016 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/http/TestHttpServerLogs.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e80aece/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 900b6de..b2a3167 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -38,6 +38,9 @@ Release 2.9.0 - UNRELEASED HADOOP-12749. Create a threadpoolexecutor that overrides afterExecute to log uncaught exceptions/errors. (Sidharta Seethana via vvasudev) + HADOOP-12710. Remove dependency on commons-httpclient for TestHttpServerLogs + (Wei-Chiu Chuang via iwasakims) + BUG FIXES HADOOP-12605. Fix intermittent failure of TestIPC.testIpcWithReaderQueuing http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e80aece/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLogs.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLogs.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLogs.java index 46ea095..d72a958 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLogs.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/http/TestHttpServerLogs.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.http; -import org.apache.commons.httpclient.HttpStatus; +import org.apache.http.HttpStatus; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration;
