Author: arp Date: Tue Dec 3 17:33:46 2013 New Revision: 1547492 URL: http://svn.apache.org/r1547492 Log: Merging r1547121 through r1547473 from trunk to branch HDFS-2832
Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt (contents, props changed) hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1547492&r1=1547491&r2=1547492&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt Tue Dec 3 17:33:46 2013 @@ -286,7 +286,7 @@ Trunk (Unreleased) HADOOP-8589. ViewFs tests fail when tests and home dirs are nested (sanjay Radia) -Release 2.3.0 - UNRELEASED +Release 2.4.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -455,7 +455,7 @@ Release 2.3.0 - UNRELEASED HADOOP-10135 writes to swift fs over partition size leave temp files and empty output file (David Dobbins via stevel) -Release 2.2.1 - UNRELEASED +Release 2.3.0 - UNRELEASED INCOMPATIBLE CHANGES @@ -519,6 +519,9 @@ Release 2.2.1 - UNRELEASED HADOOP-10130. RawLocalFS::LocalFSFileInputStream.pread does not track FS::Statistics (Binglin Chang via Colin Patrick McCabe) + HDFS-5560. Trash configuration log statements prints incorrect units. + (Josh Elser via Andrew Wang) + Release 2.2.0 - 2013-10-13 INCOMPATIBLE CHANGES Propchange: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1547121-1547473 Propchange: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1547121-1547473 Modified: hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java?rev=1547492&r1=1547491&r2=1547492&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java (original) +++ hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/TrashPolicyDefault.java Tue Dec 3 17:33:46 2013 @@ -90,8 +90,8 @@ public class TrashPolicyDefault extends FS_TRASH_CHECKPOINT_INTERVAL_KEY, FS_TRASH_CHECKPOINT_INTERVAL_DEFAULT) * MSECS_PER_MINUTE); LOG.info("Namenode trash configuration: Deletion interval = " + - this.deletionInterval + " minutes, Emptier interval = " + - this.emptierInterval + " minutes."); + (this.deletionInterval / MSECS_PER_MINUTE) + " minutes, Emptier interval = " + + (this.emptierInterval / MSECS_PER_MINUTE) + " minutes."); } private Path makeTrashRelativePath(Path basePath, Path rmFilePath) {