Author: atm
Date: Tue Nov 29 17:55:28 2011
New Revision: 1208002
URL: http://svn.apache.org/viewvc?rev=1208002&view=rev
Log:
Merge trunk into HA branch.
Modified:
hadoop/common/branches/HDFS-1623/ (props changed)
hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml
Propchange: hadoop/common/branches/HDFS-1623/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 29 17:55:28 2011
@@ -1 +1 @@
-/hadoop/common/trunk:1152502-1207485
+/hadoop/common/trunk:1152502-1208001
Modified: hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml?rev=1208002&r1=1208001&r2=1208002&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml
(original)
+++ hadoop/common/branches/HDFS-1623/hadoop-tools/hadoop-streaming/pom.xml Tue
Nov 29 17:55:28 2011
@@ -29,7 +29,7 @@
<properties>
<hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
-
<test.exclude.pattern>%regex[.*(TestStreamingBadRecords|TestStreamingCombiner|TestStreamingStatus|TestUlimit).*]</test.exclude.pattern>
+
<test.exclude.pattern>%regex[.*(TestStreamingBadRecords|TestStreamingStatus|TestUlimit).*]</test.exclude.pattern>
</properties>
<dependencies>
