hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1463350 - in /hadoop/common/branches/branch-1-win: ./ CHANGES.txt src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
Date Tue, 02 Apr 2013 01:43:18 GMT
Author: szetszwo
Date: Tue Apr  2 01:43:17 2013
New Revision: 1463350

URL: http://svn.apache.org/r1463350
Log:
svn merge -c 1340270 from branch-1 for HADOOP-8329. Build fails with Java 7.

Modified:
    hadoop/common/branches/branch-1-win/   (props changed)
    hadoop/common/branches/branch-1-win/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-1-win/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java

Propchange: hadoop/common/branches/branch-1-win/
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1:r1340270

Modified: hadoop/common/branches/branch-1-win/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.txt?rev=1463350&r1=1463349&r2=1463350&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.txt Tue Apr  2 01:43:17 2013
@@ -143,6 +143,8 @@ Release 1.1.0 - (partial upto at r129350
 
     HDFS-2701. Cleanup FS* processIOError methods. (eli)
 
+    HADOOP-8329. Build fails with Java 7. (eli)
+
     HDFS-2547. Fix inaccuracy in ReplicationTargetChooser comments. (harsh)
 
     MAPREDUCE-2919. The JT web UI should show job start times. (harsh)

Propchange: hadoop/common/branches/branch-1-win/CHANGES.txt
------------------------------------------------------------------------------
  Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1340270

Modified: hadoop/common/branches/branch-1-win/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java?rev=1463350&r1=1463349&r2=1463350&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
(original)
+++ hadoop/common/branches/branch-1-win/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
Tue Apr  2 01:43:17 2013
@@ -613,10 +613,10 @@ public class Gridmix extends Configured 
     }
   }
 
-  private <T> String getEnumValues(Enum<? extends T>[] e) {
+  private String getEnumValues(Enum<?>[] e) {
     StringBuilder sb = new StringBuilder();
     String sep = "";
-    for (Enum<? extends T> v : e) {
+    for (Enum<?> v : e) {
       sb.append(sep);
       sb.append(v.name());
       sep = "|";



Mime
View raw message