Author: szetszwo Date: Fri Apr 13 23:50:21 2012 New Revision: 1326020 URL: http://svn.apache.org/viewvc?rev=1326020&view=rev Log: Merge r1326009 through r1326019 from trunk.
Modified: hadoop/common/branches/HDFS-3092/hadoop-common-project/ (props changed) hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/HDFS-3092/hadoop-common-project/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Apr 13 23:50:21 2012 @@ -1 +1,4 @@ target +.classpath +.project +.settings Propchange: hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1326009-1326019 Propchange: hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/docs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1326009-1326019 Propchange: hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1326009-1326019 Propchange: hadoop/common/branches/HDFS-3092/hadoop-common-project/hadoop-common/src/test/core/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1326009-1326019