From 4608dea16908f1ecc2039706b893ac0505bb7581 Mon Sep 17 00:00:00 2001
From: Prashant Sharma <prashant.s@imaginea.com>
Date: Tue, 21 Oct 2014 16:33:15 +0530
Subject: [PATCH 1/3] [SPARK-4032] Deprecate YARN alpha support in Spark 1.2

---
 yarn/pom.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/yarn/pom.xml b/yarn/pom.xml
index 8a7035c85e9f1..2885e6607ec24 100644
--- a/yarn/pom.xml
+++ b/yarn/pom.xml
@@ -73,6 +73,28 @@
   <profiles>
     <profile>
       <id>yarn-alpha</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <phase>validate</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <tasks>
+                    <echo>*******************************************************************************************</echo>
+                    <echo>***WARNING***: Support for YARN-alpha API's will be removed in Spark 1.3 (see SPARK-3445).*</echo>
+                    <echo>*******************************************************************************************</echo>
+                  </tasks>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
       <modules>
         <module>alpha</module>
       </modules>

From 3a34b1e138cccfcfa681a8ac07614483292ed5b8 Mon Sep 17 00:00:00 2001
From: Prashant Sharma <prashant.s@imaginea.com>
Date: Wed, 22 Oct 2014 12:22:24 +0530
Subject: [PATCH 2/3] Updated docs...

---
 docs/building-spark.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/building-spark.md b/docs/building-spark.md
index 11fd56c145c01..4cc0b1f2e5116 100644
--- a/docs/building-spark.md
+++ b/docs/building-spark.md
@@ -67,11 +67,13 @@ For Apache Hadoop 2.x, 0.23.x, Cloudera CDH, and other Hadoop versions with YARN
     <tr><th>YARN version</th><th>Profile required</th></tr>
   </thead>
   <tbody>
-    <tr><td>0.23.x to 2.1.x</td><td>yarn-alpha</td></tr>
+    <tr><td>0.23.x to 2.1.x</td><td>yarn-alpha (Deprecated.)</td></tr>
     <tr><td>2.2.x and later</td><td>yarn</td></tr>
   </tbody>
 </table>
 
+Note: Support for YARN-alpha API's will be removed in Spark 1.3 (see SPARK-3445).
+
 Examples:
 
 {% highlight bash %}

From 17e9857eac51b1a99c08ec6f5d899d907ad5d9fa Mon Sep 17 00:00:00 2001
From: Prashant Sharma <prashant.s@imaginea.com>
Date: Fri, 24 Oct 2014 14:50:03 +0530
Subject: [PATCH 3/3] added deperecated comment to Client and ExecutorRunnable.

---
 .../src/main/scala/org/apache/spark/deploy/yarn/Client.scala    | 2 ++
 .../scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
index 9c66c785848a5..73b705ba50051 100644
--- a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
+++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -35,6 +35,7 @@ import org.apache.spark.deploy.SparkHadoopUtil
 /**
  * Version of [[org.apache.spark.deploy.yarn.ClientBase]] tailored to YARN's alpha API.
  */
+@deprecated("use yarn/stable", "1.2.0")
 private[spark] class Client(
     val args: ClientArguments,
     val hadoopConf: Configuration,
@@ -131,6 +132,7 @@ object Client {
       println("WARNING: This client is deprecated and will be removed in a " +
         "future version of Spark. Use ./bin/spark-submit with \"--master yarn\"")
     }
+    println("WARNING: Support for YARN-alpha API's will be removed in Spark 1.3 (see SPARK-3445)")
 
     // Set an env variable indicating we are running in YARN mode.
     // Note that any env variable with the SPARK_ prefix gets propagated to all (remote) processes
diff --git a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala
index 229b7a09f456b..7ee4b5c842df1 100644
--- a/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala
+++ b/yarn/alpha/src/main/scala/org/apache/spark/deploy/yarn/ExecutorRunnable.scala
@@ -37,7 +37,7 @@ import org.apache.hadoop.yarn.util.{Apps, ConverterUtils, Records, ProtoUtils}
 
 import org.apache.spark.{SecurityManager, SparkConf, Logging}
 
-
+@deprecated("use yarn/stable", "1.2.0")
 class ExecutorRunnable(
     container: Container,
     conf: Configuration,