Updated Branches: refs/heads/master 084839ba3 -> 446403b63
Merge pull request #554 from sryza/sandy-spark-1056. Closes #554. SPARK-1056. Fix header comment in Executor to not imply that it's only u... ...sed for Mesos and Standalone. Author: Sandy Ryza <sa...@cloudera.com> == Merge branch commits == commit 1f2443d902a26365a5c23e4af9077e1539ed2eab Author: Sandy Ryza <sa...@cloudera.com> Date: Thu Feb 6 15:03:50 2014 -0800 SPARK-1056. Fix header comment in Executor to not imply that it's only used for Mesos and Standalone Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/446403b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/446403b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/446403b6 Branch: refs/heads/master Commit: 446403b63763157831ddbf6209044efc3cc7bf7c Parents: 084839b Author: Sandy Ryza <sa...@cloudera.com> Authored: Thu Feb 6 15:41:16 2014 -0800 Committer: Reynold Xin <r...@apache.org> Committed: Thu Feb 6 15:41:16 2014 -0800 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/executor/Executor.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/446403b6/core/src/main/scala/org/apache/spark/executor/Executor.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/executor/Executor.scala b/core/src/main/scala/org/apache/spark/executor/Executor.scala index c1b57f7..f7efd74 100644 --- a/core/src/main/scala/org/apache/spark/executor/Executor.scala +++ b/core/src/main/scala/org/apache/spark/executor/Executor.scala @@ -32,7 +32,7 @@ import org.apache.spark.storage.{StorageLevel, TaskResultBlockId} import org.apache.spark.util.Utils /** - * Spark executor used with Mesos and the standalone scheduler. + * Spark executor used with Mesos, YARN, and the standalone scheduler. */ private[spark] class Executor( executorId: String,