HADOOP-5078. Remove invalid AMI kernel in EC2 scripts.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/trunk@738837 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -66,6 +66,8 @@ Trunk (unreleased changes)
     HADOOP-4975. Set classloader for nested mapred.join configs. (Jingkei Ly
     via cdouglas)
 
+    HADOOP-5078. Remove invalid AMI kernel in EC2 scripts. (tomwhite)
+
 Release 0.20.0 - Unreleased
 
   INCOMPATIBLE CHANGES

src/contrib/ec2/bin/hadoop-ec2-env.sh.template

@@ -88,14 +88,6 @@ else
   JAVA_BINARY_URL=''
 fi
 
-if [ "$INSTANCE_TYPE" == "c1.medium" ]; then
-  AMI_KERNEL=aki-9b00e5f2 # ec2-public-images/vmlinuz-2.6.18-xenU-ec2-v1.0.i386.aki.manifest.xml
-fi
-
-if [ "$INSTANCE_TYPE" == "c1.xlarge" ]; then
-  AMI_KERNEL=aki-9800e5f1 # ec2-public-images/vmlinuz-2.6.18-xenU-ec2-v1.0.x86_64.aki.manifest.xml
-fi
-
 if [ "$AMI_KERNEL" != "" ]; then
   KERNEL_ARG="--kernel ${AMI_KERNEL}"
 fi