You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aa...@apache.org on 2017/05/10 19:17:38 UTC
hadoop git commit: HDFS-11795. Fix ASF License warnings in
branch-2.7. Contributed by Yiqun Lin.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 48c5e37ab -> f052976ff
HDFS-11795. Fix ASF License warnings in branch-2.7. Contributed by Yiqun Lin.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f052976f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f052976f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f052976f
Branch: refs/heads/branch-2.7
Commit: f052976ff1c80adf1a0d4709603ac5b9cbfc60ab
Parents: 48c5e37
Author: Akira Ajisaka <aa...@apache.org>
Authored: Wed May 10 14:17:00 2017 -0500
Committer: Akira Ajisaka <aa...@apache.org>
Committed: Wed May 10 14:17:00 2017 -0500
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 9 ++++++---
.../blockmanagement/TestBlocksWithNotEnoughRacks.java | 4 ++--
.../apache/hadoop/hdfs/server/namenode/TestHostsFiles.java | 4 ++--
.../hadoop/hdfs/server/namenode/TestNameNodeMXBean.java | 3 +--
4 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f052976f/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index ce225d9..6af4a0f 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -265,9 +265,12 @@ Release 2.7.4 - UNRELEASED
HDFS-11766. Fix findbugs warning in branch-2.7. (Chen Liang via aajisaka)
- HDFS-11373. Backport HDFS-11258 and HDFS-11272
- (File mtime change could not save to editlog).
- (Contributed by Jimmy Xiang, backported by Akira Ajisaka)
+ HDFS-11373. Backport HDFS-11258 and HDFS-11272
+ (File mtime change could not save to editlog).
+ (Contributed by Jimmy Xiang, backported by Akira Ajisaka)
+
+ HDFS-11795. Fix ASF License warnings in branch-2.7.
+ (Yiqun Lin via aajisaka)
Release 2.7.3 - 2016-08-25
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f052976f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
index 1bc7cdc..2636a09 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
@@ -387,7 +387,7 @@ public class TestBlocksWithNotEnoughRacks {
// Configure an excludes file
FileSystem localFileSys = FileSystem.getLocal(conf);
Path workingDir = localFileSys.getWorkingDirectory();
- Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+ Path dir = new Path(workingDir, MiniDFSCluster.getBaseDirectory());
Path excludeFile = new Path(dir, "exclude");
Path includeFile = new Path(dir, "include");
assertTrue(localFileSys.mkdirs(dir));
@@ -440,7 +440,7 @@ public class TestBlocksWithNotEnoughRacks {
// Configure an excludes file
FileSystem localFileSys = FileSystem.getLocal(conf);
Path workingDir = localFileSys.getWorkingDirectory();
- Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+ Path dir = new Path(workingDir, MiniDFSCluster.getBaseDirectory());
Path excludeFile = new Path(dir, "exclude");
Path includeFile = new Path(dir, "include");
assertTrue(localFileSys.mkdirs(dir));
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f052976f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
index d8a6f81..70f73dc 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
@@ -82,7 +82,7 @@ public class TestHostsFiles {
// Configure an excludes file
FileSystem localFileSys = FileSystem.getLocal(conf);
Path workingDir = localFileSys.getWorkingDirectory();
- Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+ Path dir = new Path(workingDir, MiniDFSCluster.getBaseDirectory());
Path excludeFile = new Path(dir, "exclude");
Path includeFile = new Path(dir, "include");
assertTrue(localFileSys.mkdirs(dir));
@@ -137,7 +137,7 @@ public class TestHostsFiles {
// Configure an excludes file
FileSystem localFileSys = FileSystem.getLocal(conf);
Path workingDir = localFileSys.getWorkingDirectory();
- Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+ Path dir = new Path(workingDir, MiniDFSCluster.getBaseDirectory());
Path excludeFile = new Path(dir, "exclude");
Path includeFile = new Path(dir, "include");
assertTrue(localFileSys.mkdirs(dir));
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f052976f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
index d1e5673..f38eb36 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestNameNodeMXBean.java
@@ -228,8 +228,7 @@ public class TestNameNodeMXBean {
// Define include file to generate deadNodes metrics
FileSystem localFileSys = FileSystem.getLocal(conf);
Path workingDir = localFileSys.getWorkingDirectory();
- Path dir = new Path(workingDir,
- "build/test/data/temp/TestNameNodeMXBean");
+ Path dir = new Path(workingDir, MiniDFSCluster.getBaseDirectory());
Path includeFile = new Path(dir, "include");
assertTrue(localFileSys.mkdirs(dir));
StringBuilder includeHosts = new StringBuilder();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org