/[Apache-SVN]
ViewVC logotype

Revision 1309576

Jump to revision: Previous Next
Author: todd
Date: Wed Apr 4 20:00:15 2012 UTC (12 years, 7 months ago)
Changed paths: 63
Log Message: 
Merge trunk into auto-HA branch

Resolved some trivial conflicts in NNHAServiceTarget

Changed paths

Path Details
Directoryhadoop/common/branches/HDFS-3042/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/CHANGES.txt modified , text changed , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/docs/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/java/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/HAServiceTarget.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ShellCommandFencer.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/core/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestShellCommandFencer.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/
(Copied from hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client, r1309567) 		added
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/HdfsAdmin.java
(Copied from hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/client/HdfsAdmin.java, r1309567) 		replaced
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/NNHAServiceTarget.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/native/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java
(Copied from hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHdfsAdmin.java, r1309567) 		added
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerTestUtil.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/FSImageTestUtil.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSHAAdminMiniCluster.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/CHANGES.txt modified , text changed , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/conf/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TaskAttemptImpl.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/local/LocalContainerAllocator.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/util/TestMRApps.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/JobCounter.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/org/apache/hadoop/mapreduce/JobCounter.properties modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobCleanup.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestSpeculativeExecution.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/HDFSHighAvailability.apt.vm modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/c++/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/block_forensics/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/build-contrib.xml modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/build.xml modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/data_join/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/eclipse-plugin/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/index/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/contrib/vaidya/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/examples/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/java/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/fs/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/hdfs/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/ipc/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapreduce/security/TestTokenCache.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-mapreduce-project/src/webapps/job/ modified , props changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-project/pom.xml modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/src/main/java/org/apache/hadoop/tools/HadoopArchives.java modified , text changed
Directoryhadoop/common/branches/HDFS-3042/hadoop-tools/hadoop-archives/src/test/java/org/apache/hadoop/tools/TestHadoopArchives.java modified , text changed
infrastructure at apache.org
 ViewVC Help
Powered by ViewVC 1.1.26