svn-commit.tmp 860 B

123456789101112131415161718192021
  1. Merging changes r1087114:r1087900 from trunk to federation
  2. --This line, and those below, will be ignored--
  3. _M .
  4. M CHANGES.txt
  5. _M src/test/hdfs
  6. M src/test/hdfs/org/apache/hadoop/hdfs/server/datanode/TestTransferRbw.java
  7. M src/test/hdfs/org/apache/hadoop/hdfs/DFSTestUtil.java
  8. _M src/contrib/hdfsproxy
  9. _M src/java
  10. M src/java/org/apache/hadoop/hdfs/protocol/DataTransferProtocol.java
  11. M src/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
  12. M src/java/org/apache/hadoop/hdfs/server/datanode/FSDataset.java
  13. M src/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
  14. M src/java/org/apache/hadoop/hdfs/server/datanode/BlockReceiver.java
  15. _M src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
  16. _M src/webapps/datanode
  17. _M src/webapps/hdfs
  18. _M src/webapps/secondary
  19. _M src/c++/libhdfs
  20. MM build.xml