Author: bobby Date: Thu May 31 15:17:39 2012 New Revision: 1344764 URL: http://svn.apache.org/viewvc?rev=1344764&view=rev Log: svn merge -c 1344763 FIXES: MAPREDUCE-4297. Usersmap file in gridmix should not fail on empty lines (Ravi Prakash via bobby)
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/gridmix.xml Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1344764&r1=1344763&r2=1344764&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Thu May 31 15:17:39 2012 @@ -431,6 +431,9 @@ Release 0.23.3 - UNRELEASED MAPREDUCE-4152. map task left hanging after AM dies trying to connect to RM (Tom Graves via bobby) + MAPREDUCE-4297. Usersmap file in gridmix should not fail on empty lines + (Ravi Prakash via bobby) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/gridmix.xml URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/gridmix.xml?rev=1344764&r1=1344763&r2=1344764&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/gridmix.xml (original) +++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/src/docs/src/documentation/content/xdocs/gridmix.xml Thu May 31 15:17:39 2012 @@ -522,7 +522,8 @@ hadoop jar <gridmix-jar> org.apach </source> <p>For backward compatibility reasons, each line of users-list file can contain username followed by groupnames in the form username[,group]*. - The groupnames will be ignored by Gridmix. + The groupnames will be ignored by Gridmix. Empty lines will also be + ignored. </p> </section>