Author: szetszwo Date: Mon Jan 14 03:44:35 2013 New Revision: 1432796 URL: http://svn.apache.org/viewvc?rev=1432796&view=rev Log: Merge r1426019 through r1432788 from trunk.
Modified: hadoop/common/branches/HDFS-2802/ (props changed) hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-streaming/pom.xml Propchange: hadoop/common/branches/HDFS-2802/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk:r1426019-1432788 Modified: hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-streaming/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-streaming/pom.xml?rev=1432796&r1=1432795&r2=1432796&view=diff ============================================================================== --- hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-streaming/pom.xml (original) +++ hadoop/common/branches/HDFS-2802/hadoop-tools/hadoop-streaming/pom.xml Mon Jan 14 03:44:35 2013 @@ -141,5 +141,14 @@ </configuration> </plugin> </plugins> + <testResources> + <testResource> + <directory>${basedir}/../../hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/conf</directory> + <includes> + <include>capacity-scheduler.xml</include> + </includes> + <filtering>false</filtering> + </testResource> + </testResources> </build> </project>