/[Apache-SVN]
ViewVC logotype

Revision 1235078

Jump to revision: Previous Next
Author: todd
Date: Tue Jan 24 00:00:05 2012 UTC (12 years, 8 months ago)
Changed paths: 51
Log Message: 
Merge trunk into HA branch.

- Some conflicts on BlockManager due to the recent commit of HDFS-2822 - moved logic to processMisReplicatedBlock function
- testNoExtensionIfNoBlocks(org.apache.hadoop.hdfs.TestSafeMode) is now failing due to an existing bug in the HA branch, to be fixed soon

Changed paths

Path Details
Directoryhadoop/common/branches/HDFS-1623/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/CHANGES.txt modified , text changed , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/docs/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/compress/Decompressor.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-common-project/hadoop-common/src/test/core/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockPlacementPolicyDefault.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/native/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestSafeMode.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/.gitignore modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/CHANGES.txt modified , text changed , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/conf/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/Job.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/main/java/org/apache/hadoop/mapred/ClientServiceDelegate.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/FileBench.java modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/io/TestSequenceFileMergeProgress.java modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/amfilter/AmIpFilter.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter, r1235069) 		added
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java
(Copied from hadoop/common/trunk/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/test/java/org/apache/hadoop/yarn/server/webproxy/amfilter/TestAmFilter.java, r1235069) 		replaced
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/c++/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/block_forensics/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build-contrib.xml modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/build.xml modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/data_join/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/index/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/contrib/vaidya/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/examples/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/java/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/src/webapps/job/ modified , props changed
infrastructure at apache.org
 ViewVC Help
Powered by ViewVC 1.1.26