Harvey Feng 9eae80f111 Merge branch 'master' into yarn-cleanup ... Conflicts: yarn/src/main/scala/org/apache/spark/deploy/yarn/ApplicationMaster.scala yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala yarn/src/main/scala/org/apache/spark/deploy/yarn/WorkerRunnable.scala yarn/src/main/scala/org/apache/spark/deploy/yarn/YarnAllocationHandler.scala		2013-11-21 03:41:57 -08:00
..
src	Merge branch 'master' into yarn-cleanup	2013-11-21 03:41:57 -08:00
pom.xml	Allow spark on yarn to be run from HDFS. Allows the spark.jar, app.jar, and log4j.properties to be put into hdfs.	2013-11-04 16:16:28 -06:00