Repository: hadoop Updated Branches: refs/heads/branch-2 fef5efa0c -> 10da1bfce
HADOOP-11440. Use "test.build.data" instead of "build.test.dir" for testing in ClientBaseWithFixes. Contributed by Kengo Seki. (cherry picked from commit 18fb421fab73789a9b692f21a99d619b5dc5c9ff) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10da1bfc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10da1bfc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10da1bfc Branch: refs/heads/branch-2 Commit: 10da1bfce20ef2948d6364f5605cbb6492229a51 Parents: fef5efa Author: Akira Ajisaka <aajis...@apache.org> Authored: Wed Feb 18 17:55:04 2015 -0800 Committer: Akira Ajisaka <aajis...@apache.org> Committed: Wed Feb 18 17:56:02 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/10da1bfc/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 a73a3e9..21be30a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -207,6 +207,9 @@ Release 2.7.0 - UNRELEASED HADOOP-11521. Make connection timeout configurable in s3a. (Thomas Demoor via stevel) + HADOOP-11440. Use "test.build.data" instead of "build.test.dir" for testing + in ClientBaseWithFixes. (Kengo Seki via aajisaka) + OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/10da1bfc/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java index 11d4657..7d0727a 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/ClientBaseWithFixes.java @@ -66,7 +66,7 @@ public abstract class ClientBaseWithFixes extends ZKTestCase { public static int CONNECTION_TIMEOUT = 30000; static final File BASETEST = - new File(System.getProperty("build.test.dir", "build")); + new File(System.getProperty("test.build.data", "build")); protected final String hostPort = initHostPort(); protected int maxCnxns = 0;
