Author: rangadi
Date: Tue Sep 23 15:40:27 2008
New Revision: 698380
URL: http://svn.apache.org/viewvc?rev=698380&view=rev
Log:
Merged HADOOP-4242 (svn revision 698176) to 0.19 since
HADOOP-4006 is merged to 0.19. Original log:
HADOOP-4242. Fix CHANGES.txt to move 4242 to trunk, since the problem is not in
0.19.
Modified:
hadoop/core/branches/branch-0.19/ (props changed)
hadoop/core/branches/branch-0.19/CHANGES.txt
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
Propchange: hadoop/core/branches/branch-0.19/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 23 15:40:27 2008
@@ -1 +1 @@
-/hadoop/core/trunk:697306
+/hadoop/core/trunk:697306,698176
Modified: hadoop/core/branches/branch-0.19/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/CHANGES.txt?rev=698380&r1=698379&r2=698380&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.19/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.19/CHANGES.txt Tue Sep 23 15:40:27 2008
@@ -718,6 +718,9 @@
HADOOP-4090. The hive scripts pick up hadoop from HADOOP_HOME
and then the path. (Raghotham Murthy via dhruba)
+ HADOOP-4242. Remove extra ";" in FSDirectory that blocks compilation
+ in some IDE's. (szetszwo via omalley)
+
Release 0.18.1 - 2008-09-17
IMPROVEMENTS
Modified:
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
URL:
http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java?rev=698380&r1=698379&r2=698380&view=diff
==============================================================================
---
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
(original)
+++
hadoop/core/branches/branch-0.19/src/hdfs/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
Tue Sep 23 15:40:27 2008
@@ -31,7 +31,7 @@
import org.apache.hadoop.hdfs.protocol.FSConstants;
import org.apache.hadoop.hdfs.protocol.Block;
import org.apache.hadoop.hdfs.protocol.QuotaExceededException;
-import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;;
+import org.apache.hadoop.hdfs.server.common.HdfsConstants.StartupOption;
import org.apache.hadoop.hdfs.server.namenode.BlocksMap.BlockInfo;
/*************************************************
