/[Apache-SVN]

Revision 1519882

Jump to revision:
Author:	arp
Date:	Tue Sep 3 23:15:28 2013 UTC (11 years, 1 month ago)
Changed paths:	19
Log Message:	Merge r1518851 from trunk (reconcile branch conflicts with the fix for HDFS-5077)

Changed paths

Path	Details
hadoop/common/branches/HDFS-2832/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/CHANGES.txt	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/docs/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/main/java/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-common-project/hadoop-common/src/test/core/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt	modified , text changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/main/java/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java	modified , text changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/main/native/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/datanode/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/secondary/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/test/hdfs/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestCommitBlockSynchronization.java	modified , text changed
hadoop/common/branches/HDFS-2832/hadoop-mapreduce-project/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-mapreduce-project/CHANGES.txt	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-mapreduce-project/conf/	modified , props changed
hadoop/common/branches/HDFS-2832/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml	modified , props changed

infrastructure at apache.org	ViewVC Help
Powered by ViewVC 1.1.26