diff options
| author | Sandy Ryza <sandy@cloudera.com> | 2014-02-06 15:41:16 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2014-02-06 15:41:16 -0800 |
| commit | 446403b63763157831ddbf6209044efc3cc7bf7c (patch) | |
| tree | b5d8f406d452a460ec6166d8cd97aaf6f0df36dc /core | |
| parent | 084839ba357e03bb56517620123682b50a91cb0b (diff) | |
| download | spark-446403b63763157831ddbf6209044efc3cc7bf7c.tar.gz spark-446403b63763157831ddbf6209044efc3cc7bf7c.tar.bz2 spark-446403b63763157831ddbf6209044efc3cc7bf7c.zip | |
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 <sandy@cloudera.com>
== Merge branch commits ==
commit 1f2443d902a26365a5c23e4af9077e1539ed2eab
Author: Sandy Ryza <sandy@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
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/executor/Executor.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 c1b57f74d7..f7efd74e1b 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, |