From 7a0f89056de0bf2dd3ab55d269c6005ade712fdc Mon Sep 17 00:00:00 2001
From: Andy Feng <afeng@yahoo-inc.com>
Date: Wed, 1 Feb 2017 16:14:58 -0800
Subject: [PATCH 1/2] use hadoop 2.6

---
 ephemeral-hdfs/init.sh  | 4 ++--
 persistent-hdfs/init.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ephemeral-hdfs/init.sh b/ephemeral-hdfs/init.sh
index 0e18bca8..9e589a3c 100755
--- a/ephemeral-hdfs/init.sh
+++ b/ephemeral-hdfs/init.sh
@@ -30,11 +30,11 @@ case "$HADOOP_MAJOR_VERSION" in
     cp /root/hadoop-native/* /root/ephemeral-hdfs/lib/native/
     ;;
   yarn)
-    wget http://s3.amazonaws.com/spark-related-packages/hadoop-2.4.0.tar.gz
+    wget http://s3.amazonaws.com/spark-related-packages/hadoop-2.6.0.tar.gz
     echo "Unpacking Hadoop"
     tar xvzf hadoop-*.tar.gz > /tmp/spark-ec2_hadoop.log
     rm hadoop-*.tar.gz
-    mv hadoop-2.4.0/ ephemeral-hdfs/
+    mv hadoop-2.6.0/ ephemeral-hdfs/
 
     # Have single conf dir
     rm -rf /root/ephemeral-hdfs/etc/hadoop/
diff --git a/persistent-hdfs/init.sh b/persistent-hdfs/init.sh
index 735cebcc..518182d2 100755
--- a/persistent-hdfs/init.sh
+++ b/persistent-hdfs/init.sh
@@ -29,11 +29,11 @@ case "$HADOOP_MAJOR_VERSION" in
     cp /root/hadoop-native/* /root/persistent-hdfs/lib/native/
     ;;
   yarn)
-    wget http://s3.amazonaws.com/spark-related-packages/hadoop-2.4.0.tar.gz
+    wget http://s3.amazonaws.com/spark-related-packages/hadoop-2.6.0.tar.gz
     echo "Unpacking Hadoop"
     tar xvzf hadoop-*.tar.gz > /tmp/spark-ec2_hadoop.log
     rm hadoop-*.tar.gz
-    mv hadoop-2.4.0/ persistent-hdfs/
+    mv hadoop-2.6.0/ persistent-hdfs/
 
     # Have single conf dir
     rm -rf /root/persistent-hdfs/etc/hadoop/

From e4a6420fbe3deca2164c5f266ee3986c633bce0e Mon Sep 17 00:00:00 2001
From: Andy Feng <afeng@yahoo-inc.com>
Date: Wed, 1 Feb 2017 16:32:12 -0800
Subject: [PATCH 2/2] use hadoop 2.6

---
 spark/init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spark/init.sh b/spark/init.sh
index 71fbc7bf..164b151c 100755
--- a/spark/init.sh
+++ b/spark/init.sh
@@ -130,7 +130,7 @@ else
       elif [[ "$HADOOP_MAJOR_VERSION" == "2" ]]; then
         wget http://s3.amazonaws.com/spark-related-packages/spark-$SPARK_VERSION-bin-cdh4.tgz
       else
-        wget http://s3.amazonaws.com/spark-related-packages/spark-$SPARK_VERSION-bin-hadoop2.4.tgz
+        wget http://s3.amazonaws.com/spark-related-packages/spark-$SPARK_VERSION-bin-hadoop2.6.tgz
       fi
       if [ $? != 0 ]; then
         echo "ERROR: Unknown Spark version"