Author: eli
Date: Fri May 13 22:10:08 2011
New Revision: 1102909
URL: http://svn.apache.org/viewvc?rev=1102909&view=rev
Log:
MAPREDUCE-2103. svn merge -c 1102908 from trunk
Modified:
hadoop/mapreduce/branches/branch-0.22/ (props changed)
hadoop/mapreduce/branches/branch-0.22/.gitignore (props changed)
hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (contents, props
changed)
hadoop/mapreduce/branches/branch-0.22/conf/ (props changed)
hadoop/mapreduce/branches/branch-0.22/conf/capacity-scheduler.xml.template
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/c++/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/main.c
hadoop/mapreduce/branches/branch-0.22/src/contrib/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/block_forensics/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/build-contrib.xml
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/build.xml (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/data_join/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/eclipse-plugin/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/fairscheduler/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/index/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/mrunit/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/streaming/ (props
changed)
hadoop/mapreduce/branches/branch-0.22/src/contrib/vaidya/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/examples/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/java/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/ (props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/hdfs/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/FileBench.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/ipc/
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
(props changed)
hadoop/mapreduce/branches/branch-0.22/src/webapps/job/ (props changed)
Propchange: hadoop/mapreduce/branches/branch-0.22/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/mapred:713112
-/hadoop/mapreduce/trunk:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/.gitignore
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/.gitignore:713112
/hadoop/core/trunk/.gitignore:784664-785643
-/hadoop/mapreduce/trunk/.gitignore:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/.gitignore:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1102909&r1=1102908&r2=1102909&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Fri May 13 22:10:08 2011
@@ -203,6 +203,9 @@ Release 0.22.0 - Unreleased
MAPREDUCE-2222. Ivy resolve force mode should be turned off by default.
(Luke Lu via tomwhite)
+ MAPREDUCE-2103. task-controller shouldn't require o-r permissions.
+ (todd via eli)
+
OPTIMIZATIONS
MAPREDUCE-1354. Enhancements to JobTracker for better performance and
Propchange: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/CHANGES.txt:713112
/hadoop/mapreduce/branches/HDFS-641/CHANGES.txt:817878-835964
-/hadoop/mapreduce/trunk/CHANGES.txt:1037075,1052106,1053730,1054873,1057495,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/CHANGES.txt:1037075,1052106,1053730,1054873,1057495,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/conf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf:713112
/hadoop/core/trunk/conf:784664-785643
-/hadoop/mapreduce/trunk/conf:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/conf:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/conf/capacity-scheduler.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/conf/capacity-scheduler.xml.template:713112
/hadoop/core/trunk/conf/capacity-scheduler.xml.template:776175-785643
-/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/conf/capacity-scheduler.xml.template:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/c++/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++:713112
/hadoop/core/trunk/src/c++:776175-784663
-/hadoop/mapreduce/trunk/src/c++:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/c++:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Modified: hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/main.c
URL:
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/c%2B%2B/task-controller/main.c?rev=1102909&r1=1102908&r2=1102909&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/main.c
(original)
+++ hadoop/mapreduce/branches/branch-0.22/src/c++/task-controller/main.c Fri
May 13 22:10:08 2011
@@ -49,8 +49,8 @@ void display_usage(FILE *stream) {
* promisable. For this, we need task-controller binary to
* * be user-owned by root
* * be group-owned by a configured special group.
- * * others do not have any permissions
- * * be setuid/setgid
+ * * others do not have write or execute permissions
+ * * be setuid
*/
int check_taskcontroller_permissions(char *executable_file) {
@@ -99,19 +99,18 @@ int check_taskcontroller_permissions(cha
return -1;
}
- // check others do not have read/write/execute permissions
- if ((filestat.st_mode & S_IROTH) == S_IROTH || (filestat.st_mode & S_IWOTH)
- == S_IWOTH || (filestat.st_mode & S_IXOTH) == S_IXOTH) {
+ // check others do not have write/execute permissions
+ if ((filestat.st_mode & S_IWOTH) == S_IWOTH ||
+ (filestat.st_mode & S_IXOTH) == S_IXOTH) {
fprintf(LOGFILE,
- "The task-controller binary should not have read or write or execute for
others.\n");
+ "The task-controller binary should not have write or execute for
others.\n");
return -1;
}
- // Binary should be setuid/setgid executable
- if ((filestat.st_mode & S_ISUID) != S_ISUID || (filestat.st_mode & S_ISGID)
- != S_ISGID) {
- fprintf(LOGFILE,
- "The task-controller binary should be set setuid and setgid bits.\n");
+ // Binary should be setuid executable
+ if ((filestat.st_mode & S_ISUID) != S_ISUID) {
+ fprintf(LOGFILE,
+ "The task-controller binary should be set setuid.\n");
return -1;
}
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib:713112
/hadoop/core/trunk/src/contrib:784664-785643
-/hadoop/mapreduce/trunk/src/contrib:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/block_forensics/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,2 +1,2 @@
/hadoop/core/branches/branch-0.19/hdfs/src/contrib/block_forensics:713112
-/hadoop/mapreduce/trunk/src/contrib/block_forensics:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/block_forensics:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build-contrib.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build-contrib.xml:713112
/hadoop/core/trunk/src/contrib/build-contrib.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/build-contrib.xml:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/build.xml:713112
/hadoop/core/trunk/src/contrib/build.xml:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/build.xml:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/build.xml:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/contrib/capacity-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/capacity-scheduler:713112
/hadoop/core/trunk/src/contrib/capacity-scheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/data_join/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/data_join:713112
/hadoop/core/trunk/src/contrib/data_join:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/data_join:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/data_join:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/dynamic-scheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/src/contrib/dynamic-scheduler:713112
/hadoop/core/trunk/src/contrib/dynamic-scheduler:784975-786373
-/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/dynamic-scheduler:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/eclipse-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/core/src/contrib/eclipse-plugin:713112
/hadoop/core/trunk/src/contrib/eclipse-plugin:776175-784663
-/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/eclipse-plugin:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/fairscheduler/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/fairscheduler:713112
/hadoop/core/trunk/src/contrib/fairscheduler:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/fairscheduler:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/fairscheduler:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/index/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/index:713112
/hadoop/core/trunk/src/contrib/index:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/index:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/index:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/mrunit/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/mrunit:713112
/hadoop/core/trunk/src/contrib/mrunit:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/mrunit:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/mrunit:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/streaming/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/streaming:713112
/hadoop/core/trunk/src/contrib/streaming:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/streaming:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/streaming:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/contrib/vaidya/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/contrib/vaidya:713112
/hadoop/core/trunk/src/contrib/vaidya:776175-786373
-/hadoop/mapreduce/trunk/src/contrib/vaidya:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/contrib/vaidya:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/examples:713112
/hadoop/core/trunk/src/examples:776175-784663
-/hadoop/mapreduce/trunk/src/examples:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/examples:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/java:713112
/hadoop/core/trunk/src/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/java:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/java:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/test/mapred/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112
/hadoop/core/trunk/src/test/mapred:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/fs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/FileBench.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/FileBench.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/ipc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112
/hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663
/hadoop/hdfs/branches/HDFS-265/src/test/hdfs-with-mr/org/apache/hadoop/ipc:796829-820463
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange:
hadoop/mapreduce/branches/branch-0.22/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112
/hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643
-/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
Propchange: hadoop/mapreduce/branches/branch-0.22/src/webapps/job/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 13 22:10:08 2011
@@ -1,3 +1,3 @@
/hadoop/core/branches/branch-0.19/mapred/src/webapps/job:713112
/hadoop/core/trunk/src/webapps/job:776175-785643
-/hadoop/mapreduce/trunk/src/webapps/job:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898
+/hadoop/mapreduce/trunk/src/webapps/job:1037075,1052106,1053730,1054873,1065861,1071054,1096520,1096649,1102898,1102908
