Author: vinodkv
Date: Sun Jan 26 04:51:10 2014
New Revision: 1561452
URL: http://svn.apache.org/r1561452
Log:
YARN-321. Merging YARN-321 branch to trunk.
svn merge ../branches/YARN-321
Modified:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/ (props changed)
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/ (props
changed)
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native/
(props changed)
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/
(props changed)
Propchange: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/YARN-321/hadoop-hdfs-project/hadoop-hdfs:r1556680-1561449
Propchange: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/YARN-321/hadoop-hdfs-project/hadoop-hdfs/src/main/java:r1556680-1561449
Propchange: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/native/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/YARN-321/hadoop-hdfs-project/hadoop-hdfs/src/main/native:r1556680-1561449
Propchange:
hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/YARN-321/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs:r1556680-1561449
