hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r885143 [1/18] - in /hadoop/hdfs/branches/HDFS-326: ./ .eclipse.templates/ .eclipse.templates/.launches/ conf/ ivy/ lib/ src/ant/org/apache/hadoop/ant/ src/ant/org/apache/hadoop/ant/condition/ src/c++/ src/c++/libhdfs/ src/c++/libhdfs/docs/...
Date Sat, 28 Nov 2009 20:06:08 GMT
Author: stevel
Date: Sat Nov 28 20:05:56 2009
New Revision: 885143

URL: http://svn.apache.org/viewvc?rev=885143&view=rev
Log:
HDFS-326 resync with trunk

Added:
    hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.launches/
      - copied from r884903, hadoop/hdfs/trunk/.eclipse.templates/.launches/
    hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.launches/AllTests.launch
      - copied unchanged from r884903, hadoop/hdfs/trunk/.eclipse.templates/.launches/AllTests.launch
    hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.launches/DataNode.launch
      - copied unchanged from r884903, hadoop/hdfs/trunk/.eclipse.templates/.launches/DataNode.launch
    hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.launches/NameNode.launch
      - copied unchanged from r884903, hadoop/hdfs/trunk/.eclipse.templates/.launches/NameNode.launch
    hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.launches/SpecificTestTemplate.launch
      - copied unchanged from r884903, hadoop/hdfs/trunk/.eclipse.templates/.launches/SpecificTestTemplate.launch
    hadoop/hdfs/branches/HDFS-326/ivy/hadoop-hdfs-template.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/ivy/hadoop-hdfs-template.xml
    hadoop/hdfs/branches/HDFS-326/ivy/hadoop-hdfs-test-template.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/ivy/hadoop-hdfs-test-template.xml
    hadoop/hdfs/branches/HDFS-326/src/c++/
      - copied from r884903, hadoop/hdfs/trunk/src/c++/
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/   (props changed)
      - copied from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/Makefile.am
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/Makefile.am
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/Makefile.in
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/Makefile.in
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/aclocal.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/aclocal.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/config.guess
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/config.guess
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/config.sub
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/config.sub
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/configure
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/configure
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/configure.ac
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/configure.ac
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/depcomp
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/depcomp
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/docs/
      - copied from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/docs/
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/docs/Doxyfile
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/docs/Doxyfile
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/docs/libhdfs_footer.html
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/docs/libhdfs_footer.html
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/hdfs.c
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/hdfs.c
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/hdfs.h
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/hdfs.h
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/hdfsJniHelper.c
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/hdfsJniHelper.c
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/hdfsJniHelper.h
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/hdfsJniHelper.h
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/hdfs_read.c
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/hdfs_read.c
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/hdfs_test.c
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/hdfs_test.c
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/hdfs_write.c
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/hdfs_write.c
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/install-sh
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/install-sh
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/ltmain.sh
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/ltmain.sh
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/
      - copied from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/apfunctions.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/apfunctions.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/apjava.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/apjava.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/apsupport.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/apsupport.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/libtool.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/libtool.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/ltoptions.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/ltoptions.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/ltsugar.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/ltsugar.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/ltversion.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/ltversion.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/m4/lt~obsolete.m4
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/m4/lt~obsolete.m4
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/missing
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/missing
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/
      - copied from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/conf/
      - copied from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/conf/
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/conf/core-site.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/conf/core-site.xml
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/conf/hadoop-site.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/conf/hadoop-site.xml
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/conf/hdfs-site.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/conf/hdfs-site.xml
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/conf/mapred-site.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/conf/mapred-site.xml
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/conf/slaves
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/conf/slaves
    hadoop/hdfs/branches/HDFS-326/src/c++/libhdfs/tests/test-libhdfs.sh
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/README
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/README
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/build.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/build.xml
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/conf/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/conf/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/conf/raid.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/conf/raid.xml
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/ivy/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/ivy/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/ivy.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/ivy.xml
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/ivy/libraries.properties
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/ivy/libraries.properties
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/lib/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/lib/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/lib/hadoop-mapred-0.22.0-dev.jar
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/lib/hadoop-mapred-0.22.0-dev.jar
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/lib/hadoop-mapred-test-0.22.0-dev.jar
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/lib/hadoop-mapred-test-0.22.0-dev.jar
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/hdfs/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/hdfs/DistributedRaidFileSystem.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/ConfigManager.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/DistRaid.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidConfigurationException.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidConfigurationException.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidNode.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/RaidShell.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyInfo.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyInfo.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyList.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/PolicyList.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/RaidProtocol.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/java/org/apache/hadoop/raid/protocol/RaidProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/apache/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/apache/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/apache/hadoop/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/apache/hadoop/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/apache/hadoop/hdfs/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/apache/hadoop/hdfs/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/apache/hadoop/hdfs/TestRaidDfs.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/apache/hadoop/raid/
      - copied from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidNode.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/contrib/raid/src/test/org/apache/hadoop/raid/TestRaidPurge.java
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hdfsproxy.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/docs/src/documentation/content/xdocs/hdfsproxy.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/resources/images/hdfs-logo.jpg
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/docs/src/documentation/resources/images/hdfs-logo.jpg
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/resources/images/hdfsproxy-forward.jpg
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/docs/src/documentation/resources/images/hdfsproxy-forward.jpg
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/resources/images/hdfsproxy-overview.jpg
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/docs/src/documentation/resources/images/hdfsproxy-overview.jpg
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/resources/images/hdfsproxy-server.jpg
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/docs/src/documentation/resources/images/hdfsproxy-server.jpg
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/resources/images/request-identify.jpg
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/docs/src/documentation/resources/images/request-identify.jpg
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/fs/
      - copied from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/fs/
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/fs/Hdfs.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/fs/Hdfs.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/ByteRangeInputStream.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/ByteRangeInputStream.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/DFSConfigKeys.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/HdfsConfiguration.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/HdfsConfiguration.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/RecoveryInProgressException.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/protocol/RecoveryInProgressException.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/security/
      - copied from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/security/
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/security/AccessTokenHandler.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/security/AccessTokenHandler.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/security/BlockAccessKey.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/security/BlockAccessKey.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/security/BlockAccessToken.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/security/BlockAccessToken.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/security/ExportedAccessKeys.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/security/ExportedAccessKeys.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/security/InvalidAccessTokenException.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/security/InvalidAccessTokenException.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetAsyncDiskService.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetAsyncDiskService.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/FinalizedReplica.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/FinalizedReplica.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/Replica.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/Replica.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaAlreadyExistsException.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaAlreadyExistsException.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaBeingWritten.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaBeingWritten.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInPipeline.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInPipeline.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInPipelineInterface.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInPipelineInterface.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaNotFoundException.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaNotFoundException.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaUnderRecovery.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaUnderRecovery.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaWaitingToBeRecovered.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaWaitingToBeRecovered.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicasMap.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicasMap.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/BlockInfoUnderConstruction.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockInfoUnderConstruction.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicy.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicy.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyDefault.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/BlockPlacementPolicyDefault.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FSClusterStats.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSClusterStats.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FSInodeInfo.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/namenode/FSInodeInfo.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/BlockRecoveryCommand.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/BlockRecoveryCommand.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/ReplicaRecoveryInfo.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/protocol/ReplicaRecoveryInfo.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/tools/HDFSConcat.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/tools/HDFSConcat.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/build/
      - copied from r884903, hadoop/hdfs/trunk/src/test/aop/build/
    hadoop/hdfs/branches/HDFS-326/src/test/aop/build/aop.xml
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/build/aop.xml
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/fi/FiHFlushTestUtil.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/fi/FiHFlushTestUtil.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/fs/
      - copied from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/fs/
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/fs/TestRename.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/fs/TestRename.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/hdfs/HFlushAspects.aj
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/PipelinesTestUtil.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/hdfs/PipelinesTestUtil.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/TestFiHFlush.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/hdfs/TestFiHFlush.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/TestFiPipelines.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/hdfs/TestFiPipelines.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/server/namenode/
      - copied from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/hdfs/server/namenode/
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/server/namenode/RenameAspects.aj
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/aop/org/apache/hadoop/hdfs/server/namenode/RenameAspects.aj
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestFcHdfsCreateMkdir.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/fs/TestFcHdfsPermission.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestFcHdfsPermission.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/fs/TestHDFSFileContextMainOperations.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/FileAppendTest4.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/FileAppendTest4.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestByteRangeInputStream.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestByteRangeInputStream.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSClientExcludedNodes.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRemove.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRemove.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDeprecatedKeys.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDeprecatedKeys.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestHFlush.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestHFlush.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestListPathServlet.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestListPathServlet.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestPipelines.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestReadWhileWriting.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestReadWhileWriting.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/security/
      - copied from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/security/SecurityTestUtil.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/SecurityTestUtil.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/security/TestAccessToken.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/security/TestAccessToken.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNodeAdapter.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/DataNodeAdapter.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReport.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDatanodeRestart.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDatanodeRestart.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestWriteToReplica.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestWriteToReplica.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NameNodeAdapter.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockUnderConstruction.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlockUnderConstruction.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlocksWithNotEnoughRacks.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBlocksWithNotEnoughRacks.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCorruptReplicaInfo.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCorruptReplicaInfo.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestDecommissioningStatus.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestHDFSConcat.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestLargeDirectoryDelete.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestLargeDirectoryDelete.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestMetaSave.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStreamFile.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/test/GenericTestUtils.java
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/test/GenericTestUtils.java
    hadoop/hdfs/branches/HDFS-326/src/test/unit/
      - copied from r884903, hadoop/hdfs/trunk/src/test/unit/
    hadoop/hdfs/branches/HDFS-326/src/test/unit/.gitignore
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/test/unit/.gitignore
    hadoop/hdfs/branches/HDFS-326/src/webapps/hdfs/block_info_xml.jsp
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/webapps/hdfs/block_info_xml.jsp
    hadoop/hdfs/branches/HDFS-326/src/webapps/hdfs/corrupt_replicas_xml.jsp
      - copied unchanged from r884903, hadoop/hdfs/trunk/src/webapps/hdfs/corrupt_replicas_xml.jsp
Removed:
    hadoop/hdfs/branches/HDFS-326/conf/capacity-scheduler.xml.template
    hadoop/hdfs/branches/HDFS-326/conf/mapred-queue-acls.xml.template
    hadoop/hdfs/branches/HDFS-326/conf/mapred-site.xml.template
    hadoop/hdfs/branches/HDFS-326/ivy/hadoop-core.pom
    hadoop/hdfs/branches/HDFS-326/lib/hadoop-core-0.21.0-dev.jar
    hadoop/hdfs/branches/HDFS-326/lib/hadoop-core-test-0.21.0-dev.jar
    hadoop/hdfs/branches/HDFS-326/lib/hadoop-mapred-0.21.0-dev.jar
    hadoop/hdfs/branches/HDFS-326/lib/hadoop-mapred-examples-0.21.0-dev.jar
    hadoop/hdfs/branches/HDFS-326/lib/hadoop-mapred-test-0.21.0-dev.jar
    hadoop/hdfs/branches/HDFS-326/src/docs/cn/
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/capacity_scheduler.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/cluster_setup.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/commands_manual.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/distcp.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/fair_scheduler.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hadoop_archives.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hdfs_shell.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hod_admin_guide.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hod_config_guide.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hod_user_guide.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/native_libraries.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/quickstart.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/service_level_auth.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/streaming.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/vaidya.xml
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/common/ThreadLocalDateFormat.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/BlockAlreadyExistsException.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/ReplicationTargetChooser.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/BlockMetaDataInfo.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs-with-mr/
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/common/TestThreadLocalDateFormat.java
Modified:
    hadoop/hdfs/branches/HDFS-326/   (props changed)
    hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath
    hadoop/hdfs/branches/HDFS-326/.gitignore
    hadoop/hdfs/branches/HDFS-326/CHANGES.txt
    hadoop/hdfs/branches/HDFS-326/build.xml   (contents, props changed)
    hadoop/hdfs/branches/HDFS-326/ivy/   (props changed)
    hadoop/hdfs/branches/HDFS-326/ivy.xml
    hadoop/hdfs/branches/HDFS-326/ivy/ivysettings.xml
    hadoop/hdfs/branches/HDFS-326/ivy/libraries.properties
    hadoop/hdfs/branches/HDFS-326/src/ant/org/apache/hadoop/ant/DfsTask.java
    hadoop/hdfs/branches/HDFS-326/src/ant/org/apache/hadoop/ant/condition/DfsBaseConditional.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/build.xml
    hadoop/hdfs/branches/HDFS-326/src/contrib/fuse-dfs/src/test/TestFuseDFS.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/   (props changed)
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/README
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/build.xml
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/ivy.xml
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/HdfsProxy.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/LdapIpDirFilter.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFileDataServlet.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyFilter.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyListPathsServlet.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyStreamFile.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyUgiManager.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/java/org/apache/hadoop/hdfsproxy/ProxyUtil.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestHdfsProxy.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/hdfsproxy/src/test/org/apache/hadoop/hdfsproxy/TestProxyUtil.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/thriftfs/ivy.xml
    hadoop/hdfs/branches/HDFS-326/src/contrib/thriftfs/src/java/org/apache/hadoop/thriftfs/HadoopThriftServer.java
    hadoop/hdfs/branches/HDFS-326/src/contrib/thriftfs/test/org/apache/hadoop/thriftfs/TestThriftfs.java
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/SLG_user_guide.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/faultinject_framework.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hdfs_design.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hdfs_imageviewer.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hdfs_permissions_guide.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hdfs_quota_admin_guide.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/hdfs_user_guide.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/index.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/libhdfs.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/site.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/content/xdocs/tabs.xml
    hadoop/hdfs/branches/HDFS-326/src/docs/src/documentation/skinconf.xml
    hadoop/hdfs/branches/HDFS-326/src/java/   (props changed)
    hadoop/hdfs/branches/HDFS-326/src/java/hdfs-default.xml
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/BlockMissingException.java   (props changed)
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/DFSClient.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/HftpFileSystem.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/HsftpFileSystem.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/Block.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/BlockListAsLongs.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/ClientDatanodeProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/ClientProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/FSConstants.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/LocatedBlock.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/protocol/LocatedBlocks.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/balancer/Balancer.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/common/GenerationStamp.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/common/HdfsConstants.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/common/JspHelper.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/common/Storage.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/BlockSender.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataBlockScanner.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataStorage.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DataXceiverServer.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DatanodeJspHelper.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/DirectoryScanner.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/FSDatasetInterface.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java   (contents, props changed)
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeActivityMBean.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/datanode/metrics/DataNodeMetrics.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/BackupNode.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/BlockInfo.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/BlockManager.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/BlocksMap.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/Checkpointer.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/CorruptReplicasMap.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/DatanodeDescriptor.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/DfsServlet.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/EditLogBackupOutputStream.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FSEditLog.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FSImage.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FileChecksumServlets.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/FsckServlet.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/INode.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/INodeDirectoryWithQuota.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/INodeFile.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/INodeFileUnderConstruction.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/LeaseManager.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/ListPathsServlet.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeFsck.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/NamenodeJspHelper.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/SecondaryNameNode.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/StreamFile.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/UnderReplicatedBlocks.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/metrics/FSNamesystemMetrics.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/namenode/metrics/NameNodeMetrics.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/DatanodeProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/DatanodeRegistration.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/InterDatanodeProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/KeyUpdateCommand.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/server/protocol/NamenodeProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/tools/DFSAdmin.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/tools/DFSck.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/ImageLoaderCurrent.java
    hadoop/hdfs/branches/HDFS-326/src/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/OfflineImageViewer.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/fi/DataTransferTestUtil.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/fi/FiConfig.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/fi/FiTestUtil.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/fi/PipelineTest.java
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/DFSClientAspects.aj
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/protocol/ClientProtocolAspects.aj
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/server/datanode/BlockReceiverAspects.aj
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/server/datanode/DataTransferProtocolAspects.aj
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/server/datanode/FSDatasetAspects.aj
    hadoop/hdfs/branches/HDFS-326/src/test/aop/org/apache/hadoop/hdfs/server/datanode/TestFiDataTransferProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/test/findbugsExcludeFile.xml
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/cli/TestHDFSCLI.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/fs/TestGlobPaths.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/fs/TestUrlStreamHandler.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/fs/loadGenerator/TestLoadGenerator.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/fs/permission/TestStickyBit.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/AppendTestUtil.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/BenchmarkThroughput.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/DFSTestUtil.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/DataNodeCluster.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/MiniDFSCluster.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestAbandonBlock.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestBlockMissingException.java   (contents, props changed)
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestBlocksScheduledCounter.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestCrcCorruption.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSClientRetries.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSFinalize.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSMkdirs.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSPermission.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRename.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSRollback.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShell.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShellGenericOptions.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSStartupVersions.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSStorageStateRecovery.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSUpgrade.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSUpgradeFromImage.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDataTransferProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeBlockScanner.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeDeath.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDatanodeReport.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDecommission.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDefaultNameNodePort.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFSInputChecker.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFSOutputSummer.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileAppend.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileAppend2.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileAppend3.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCorruption.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreation.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreationClient.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreationDelete.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileCreationEmpty.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestFileStatus.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestGetBlocks.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSFileSystemContract.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSServerPorts.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestHDFSTrash.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestInjectionForSimulatedStorage.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestLease.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestLeaseRecovery2.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestLocalDFS.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestMissingBlocksAlert.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestModTime.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestPread.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestQuota.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestRenameWhileOpen.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestReplication.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestRestartDFS.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestSafeMode.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestSeekBug.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestSetTimes.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestSetrepIncreasing.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/TestSmallBlock.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/UpgradeUtilities.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/balancer/TestBalancer.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/common/TestDistributedUpgrade.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/SimulatedFSDataset.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestBlockReplacement.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeMetrics.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDataNodeVolumeFailure.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDirectoryScanner.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestDiskError.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestInterDatanodeProtocol.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestSimulatedFSDataset.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/NNThroughputBenchmark.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestAccessTokenWithDFS.java   (contents, props changed)
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestBackupNode.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestCheckpoint.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestComputeInvalidateWork.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestEditLog.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestFileLimit.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestFsck.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestHeartbeatHandling.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNNThroughputBenchmark.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNameEditsConfigs.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNamenodeCapacityReport.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestNodeCount.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestOverReplicatedBlocks.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestReplicationPolicy.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStartup.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestStorageRestore.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/TestUnderReplicatedBlocks.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/TestNNMetricFilesInGetListingOps.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/hdfs/tools/offlineImageViewer/TestOfflineImageViewer.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/security/TestPermission.java
    hadoop/hdfs/branches/HDFS-326/src/test/hdfs/org/apache/hadoop/tools/TestJMXGet.java
    hadoop/hdfs/branches/HDFS-326/src/webapps/datanode/   (props changed)
    hadoop/hdfs/branches/HDFS-326/src/webapps/hdfs/   (props changed)
    hadoop/hdfs/branches/HDFS-326/src/webapps/secondary/   (props changed)

Propchange: hadoop/hdfs/branches/HDFS-326/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Nov 28 20:05:56 2009
@@ -1,5 +1,6 @@
 build
 build-fi
+build.properties
 logs
 .classpath
 .externalToolBuilders

Propchange: hadoop/hdfs/branches/HDFS-326/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 28 20:05:56 2009
@@ -1,2 +1,4 @@
 /hadoop/core/branches/branch-0.19/hdfs:713112
-/hadoop/hdfs/trunk:804973-807690
+/hadoop/hdfs/branches/HDFS-265:796829-820463
+/hadoop/hdfs/branches/branch-0.21:820487
+/hadoop/hdfs/trunk:804973-884907

Modified: hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath?rev=885143&r1=885142&r2=885143&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath (original)
+++ hadoop/hdfs/branches/HDFS-326/.eclipse.templates/.classpath Sat Nov 28 20:05:56 2009
@@ -2,18 +2,14 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="src" path="src/test/hdfs"/>
-	<classpathentry kind="src" path="src/test/hdfs-with-mr"/>
 	<classpathentry kind="src" path="src/ant"/>
 	<classpathentry kind="src" path="src/contrib/hdfsproxy/src/java"/>
 	<classpathentry kind="src" path="src/contrib/hdfsproxy/src/test"/>
 	<classpathentry kind="src" path="src/contrib/thriftfs/src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-core-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-core-test-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-mapred-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-mapred-examples-0.21.0-dev.jar"/>
-	<classpathentry kind="lib" path="lib/hadoop-mapred-test-0.21.0-dev.jar"/>
+	<classpathentry kind="lib" path="lib/hadoop-core-0.22.0-dev.jar"/>
+	<classpathentry kind="lib" path="lib/hadoop-core-test-0.22.0-dev.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/common/commons-cli-1.2.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/common/commons-codec-1.3.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/common/commons-el-1.0.jar"/>
@@ -38,9 +34,6 @@
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/common/slf4j-api-1.4.3.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/common/slf4j-log4j12-1.4.3.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/common/xmlenc-0.52.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/test/ftplet-api-1.0.2.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/test/ftpserver-core-1.0.2.jar"/>
-	<classpathentry kind="lib" path="build/ivy/lib/Hadoop-Hdfs/test/mina-core-2.0.0-M6.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/hdfsproxy/common/aspectjrt-1.5.3.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/hdfsproxy/common/cactus.core.framework.uberjar.javaEE.14-1.8.0.jar"/>
 	<classpathentry kind="lib" path="build/ivy/lib/hdfsproxy/common/cactus.integration.ant-1.8.0.jar"/>

Modified: hadoop/hdfs/branches/HDFS-326/.gitignore
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/HDFS-326/.gitignore?rev=885143&r1=885142&r2=885143&view=diff
==============================================================================
--- hadoop/hdfs/branches/HDFS-326/.gitignore (original)
+++ hadoop/hdfs/branches/HDFS-326/.gitignore Sat Nov 28 20:05:56 2009
@@ -16,9 +16,11 @@
 *~
 .classpath
 .project
+.launches/
 .settings
 .svn
 build/
+build.properties
 conf/masters
 conf/slaves
 conf/hadoop-env.sh
@@ -26,6 +28,10 @@
 conf/hdfs-site.xml
 conf/hadoop-policy.xml
 docs/api/
+ivy/ant-*.jar
+ivy/hadoop-hdfs.xml
+ivy/hadoop-hdfs-test.xml
+ivy/maven-ant-tasks-*.jar
 logs/
 src/docs/build
 src/docs/cn/build



Mime
View raw message