Author: umamahesh Date: Wed Jun 11 19:25:17 2014 New Revision: 1601992 URL: http://svn.apache.org/r1601992 Log: Merge HDFS-2006 HDFS XAttrs feature from Trunk to Branch-2
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/ (props changed) hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/ (props changed) Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project:r1588992-1596568 Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1596575 Propchange: hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1596575 Merged /hadoop/common/branches/HDFS-2006/hadoop-mapreduce-project/conf:r1588992-1596568