Author: szetszwo
Date: Thu Jul 4 03:42:47 2013
New Revision: 1499636
URL: http://svn.apache.org/r1499636
Log:
svn merge -c 1499154 from branch-2 for MAPREDUCE-5359. JobHistory should not
use File.separator to match timestamp in path.
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
(contents, props changed)
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
Propchange: hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1499154
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt?rev=1499636&r1=1499635&r2=1499636&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
Thu Jul 4 03:42:47 2013
@@ -439,6 +439,9 @@ Release 2.1.0-beta - 2013-07-02
MAPREDUCE-5355. MiniMRYarnCluster with localFs does not work on Windows.
(Chuan Liu via cnauroth)
+ MAPREDUCE-5359. JobHistory should not use File.separator to match timestamp
+ in path. (Chuan Liu via cnauroth)
+
MAPREDUCE-5291. Change MR App to use updated property names in
container-log4j.properties. (Zhijie Shen via sseth)
Propchange:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1499154
Modified:
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java?rev=1499636&r1=1499635&r2=1499636&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
(original)
+++
hadoop/common/branches/branch-2.1.0-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/jobhistory/JobHistoryUtils.java
Thu Jul 4 03:42:47 2013
@@ -122,7 +122,7 @@ public class JobHistoryUtils {
public static final int SERIAL_NUMBER_DIRECTORY_DIGITS = 6;
- public static final String TIMESTAMP_DIR_REGEX = "\\d{4}" + "\\" +
File.separator + "\\d{2}" + "\\" + File.separator + "\\d{2}";
+ public static final String TIMESTAMP_DIR_REGEX = "\\d{4}" + "\\" +
Path.SEPARATOR + "\\d{2}" + "\\" + Path.SEPARATOR + "\\d{2}";
public static final Pattern TIMESTAMP_DIR_PATTERN =
Pattern.compile(TIMESTAMP_DIR_REGEX);
private static final String TIMESTAMP_DIR_FORMAT = "%04d" + File.separator +
"%02d" + File.separator + "%02d";
