Repository: spark Updated Branches: refs/heads/master 31a704004 -> 6bd2eaa4a
hot fix for PR105 - change to Java annotation Author: CodingCat <[email protected]> Closes #133 from CodingCat/SPARK-1160-2 and squashes the following commits: 6607155 [CodingCat] hot fix for PR105 - change to Java annotation Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/6bd2eaa4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/6bd2eaa4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/6bd2eaa4 Branch: refs/heads/master Commit: 6bd2eaa4a5bcf811c5b85be27c5e50058b5d0c12 Parents: 31a7040 Author: CodingCat <[email protected]> Authored: Wed Mar 12 19:49:18 2014 -0700 Committer: Aaron Davidson <[email protected]> Committed: Wed Mar 12 19:49:18 2014 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/6bd2eaa4/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala b/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala index 3df68d4..2ba4fb8 100644 --- a/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala +++ b/core/src/main/scala/org/apache/spark/api/java/JavaRDDLike.scala @@ -282,8 +282,9 @@ trait JavaRDDLike[T, This <: JavaRDDLike[T, This]] extends Serializable { /** * Return an array that contains all of the elements in this RDD. + * @deprecated As of Spark 1.0.0, toArray() is deprecated, use {@link #collect()} instead */ - @deprecated("use collect", "1.0.0") + @Deprecated def toArray(): JList[T] = collect() /**
