svn commit: r1340270 - in /hadoop/common/branches/branch-1: CHANGES.txt src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java

[eli]

Author: eli
Date: Fri May 18 21:46:12 2012
New Revision: 1340270

URL: http://svn.apache.org/viewvc?rev=1340270&view=rev
Log:
HADOOP-8329. Build fails with Java 7. Contributed by Eli Collins

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    
hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1340270&r1=1340269&r2=1340270&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Fri May 18 21:46:12 2012
@@ -237,6 +237,8 @@ Release 1.1.0 - unreleased
     HDFS-3330. If GetImageServlet throws an Error or RTE, response should not
     have HTTP "OK" status. (todd via eli)
 
+    HADOOP-8329. Build fails with Java 7. (eli)
+
 Release 1.0.3 - 2012.05.07
 
   NEW FEATURES

Modified: 
hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java?rev=1340270&r1=1340269&r2=1340270&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/contrib/gridmix/src/java/org/apache/hadoop/mapred/gridmix/Gridmix.java
 Fri May 18 21:46:12 2012
@@ -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 = "|";