/[Apache-SVN]
ViewVC logotype

Revision 1243691


Jump to revision: Previous Next
Author: todd
Date: Mon Feb 13 21:00:37 2012 UTC (12 years, 9 months ago)
Changed paths: 52
Log Message:
Merge trunk into HA branch.
Some conflicts around TestBlockRecovery: mocking changed for new heartbeat types/responses


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/conf/core-site.xml
(Copied from hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/core-site.xml, r1243679)
added
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/metrics2/util/SampleStat.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-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/util/TestSampleStat.java modified , text 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/docs/src/documentation/content/xdocs/webhdfs.xml 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/balancer/NameNodeConnector.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPOfferService.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockVolumeChoosingPolicy.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.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/server/balancer/TestBalancerWithMultipleNameNodes.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBPOfferService.java modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java
(Copied from hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java, r1243679)
added , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs/src/test/unit/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java deleted
Directoryhadoop/common/branches/HDFS-1623/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/site/site.xml modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/ 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/bin/mr-jobhistory-daemon.sh modified , text 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/resources/mapred-default.xml modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/ClusterSetup.apt.vm modified , text changed
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/webapps/job/ modified , props changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-project/pom.xml modified , text changed
Directoryhadoop/common/branches/HDFS-1623/hadoop-project/src/site/site.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26