Browse Source

HDFS-11795. Fix ASF License warnings in branch-2.7. Contributed by Yiqun Lin.

Akira Ajisaka 8 years ago
parent
commit
f052976ff1

+ 6 - 3
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
 

+ 2 - 2
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));

+ 2 - 2
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));

+ 1 - 2
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();