Repository: spark
Updated Branches:
  refs/heads/master 11ded3f66 -> abea2d4ff


Minor: Fix documentation error from apache/spark#946

Author: Ankur Dave <ankurd...@gmail.com>

Closes #970 from ankurdave/SPARK-1991_docfix and squashes the following commits:

6d07343 [Ankur Dave] Minor: Fix documentation error from apache/spark#946


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/abea2d4f
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/abea2d4f
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/abea2d4f

Branch: refs/heads/master
Commit: abea2d4ff099036c67fc73136d0e61d0d0e22123
Parents: 11ded3f
Author: Ankur Dave <ankurd...@gmail.com>
Authored: Wed Jun 4 16:45:53 2014 -0700
Committer: Ankur Dave <ankurd...@gmail.com>
Committed: Wed Jun 4 16:45:53 2014 -0700

----------------------------------------------------------------------
 graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/abea2d4f/graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala 
b/graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala
index 2e814e3..f4c7936 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphLoader.scala
@@ -49,8 +49,8 @@ object GraphLoader extends Logging {
    * @param canonicalOrientation whether to orient edges in the positive
    *        direction
    * @param minEdgePartitions the number of partitions for the edge RDD
-   * @param edgeStorageLevel the desired storage level for the edge 
partitions. To set the vertex
-   *        storage level, call 
[[org.apache.spark.graphx.Graph#persistVertices]].
+   * @param edgeStorageLevel the desired storage level for the edge partitions
+   * @param vertexStorageLevel the desired storage level for the vertex 
partitions
    */
   def edgeListFile(
       sc: SparkContext,

Reply via email to