spark git commit: Fixed error in scaladoc of convertToCanonicalEdges

2015-11-12 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/branch-1.5 b478ee374 -> 3676d4c4d


Fixed error in scaladoc of convertToCanonicalEdges

The code convertToCanonicalEdges is such that srcIds are smaller than dstIds 
but the scaladoc suggested otherwise. Have fixed the same.

Author: Gaurav Kumar 

Closes #9666 from gauravkumar37/patch-1.

(cherry picked from commit df0e318152165c8e50793aff13aaca5d2d9b8b9d)
Signed-off-by: Reynold Xin 


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

Branch: refs/heads/branch-1.5
Commit: 3676d4c4de0e1f03915ed794925d841bc413cf0d
Parents: b478ee3
Author: Gaurav Kumar 
Authored: Thu Nov 12 12:14:00 2015 -0800
Committer: Reynold Xin 
Committed: Thu Nov 12 12:14:16 2015 -0800

--
 graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/3676d4c4/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
--
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala 
b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index 9451ff1..9827dfa 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -282,7 +282,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, 
ED]) extends Seriali
* Convert bi-directional edges into uni-directional ones.
* Some graph algorithms (e.g., TriangleCount) assume that an input graph
* has its edges in canonical direction.
-   * This function rewrites the vertex ids of edges so that srcIds are bigger
+   * This function rewrites the vertex ids of edges so that srcIds are smaller
* than dstIds, and merges the duplicated edges.
*
* @param mergeFunc the user defined reduce function which should


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: Fixed error in scaladoc of convertToCanonicalEdges

2015-11-12 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/master 08660a0bc -> df0e31815


Fixed error in scaladoc of convertToCanonicalEdges

The code convertToCanonicalEdges is such that srcIds are smaller than dstIds 
but the scaladoc suggested otherwise. Have fixed the same.

Author: Gaurav Kumar 

Closes #9666 from gauravkumar37/patch-1.


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

Branch: refs/heads/master
Commit: df0e318152165c8e50793aff13aaca5d2d9b8b9d
Parents: 08660a0
Author: Gaurav Kumar 
Authored: Thu Nov 12 12:14:00 2015 -0800
Committer: Reynold Xin 
Committed: Thu Nov 12 12:14:00 2015 -0800

--
 graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/df0e3181/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
--
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala 
b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index 9451ff1..9827dfa 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -282,7 +282,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, 
ED]) extends Seriali
* Convert bi-directional edges into uni-directional ones.
* Some graph algorithms (e.g., TriangleCount) assume that an input graph
* has its edges in canonical direction.
-   * This function rewrites the vertex ids of edges so that srcIds are bigger
+   * This function rewrites the vertex ids of edges so that srcIds are smaller
* than dstIds, and merges the duplicated edges.
*
* @param mergeFunc the user defined reduce function which should


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: Fixed error in scaladoc of convertToCanonicalEdges

2015-11-12 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 c3a0c7728 -> 4aacbe9e6


Fixed error in scaladoc of convertToCanonicalEdges

The code convertToCanonicalEdges is such that srcIds are smaller than dstIds 
but the scaladoc suggested otherwise. Have fixed the same.

Author: Gaurav Kumar 

Closes #9666 from gauravkumar37/patch-1.

(cherry picked from commit df0e318152165c8e50793aff13aaca5d2d9b8b9d)
Signed-off-by: Reynold Xin 


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

Branch: refs/heads/branch-1.6
Commit: 4aacbe9e65959bf1ea99ca819333c8a056705a66
Parents: c3a0c77
Author: Gaurav Kumar 
Authored: Thu Nov 12 12:14:00 2015 -0800
Committer: Reynold Xin 
Committed: Thu Nov 12 12:14:08 2015 -0800

--
 graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/4aacbe9e/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
--
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala 
b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index 9451ff1..9827dfa 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -282,7 +282,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, 
ED]) extends Seriali
* Convert bi-directional edges into uni-directional ones.
* Some graph algorithms (e.g., TriangleCount) assume that an input graph
* has its edges in canonical direction.
-   * This function rewrites the vertex ids of edges so that srcIds are bigger
+   * This function rewrites the vertex ids of edges so that srcIds are smaller
* than dstIds, and merges the duplicated edges.
*
* @param mergeFunc the user defined reduce function which should


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: Fixed error in scaladoc of convertToCanonicalEdges

2015-11-12 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/branch-1.3 b90e5cba2 -> 1bfa00d54


Fixed error in scaladoc of convertToCanonicalEdges

The code convertToCanonicalEdges is such that srcIds are smaller than dstIds 
but the scaladoc suggested otherwise. Have fixed the same.

Author: Gaurav Kumar 

Closes #9666 from gauravkumar37/patch-1.

(cherry picked from commit df0e318152165c8e50793aff13aaca5d2d9b8b9d)
Signed-off-by: Reynold Xin 


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

Branch: refs/heads/branch-1.3
Commit: 1bfa00d54e502ad14e70e4dcc488682e32625f7e
Parents: b90e5cb
Author: Gaurav Kumar 
Authored: Thu Nov 12 12:14:00 2015 -0800
Committer: Reynold Xin 
Committed: Thu Nov 12 12:14:35 2015 -0800

--
 graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/1bfa00d5/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
--
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala 
b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index dc8b478..f83d214 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -282,7 +282,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, 
ED]) extends Seriali
* Convert bi-directional edges into uni-directional ones.
* Some graph algorithms (e.g., TriangleCount) assume that an input graph
* has its edges in canonical direction.
-   * This function rewrites the vertex ids of edges so that srcIds are bigger
+   * This function rewrites the vertex ids of edges so that srcIds are smaller
* than dstIds, and merges the duplicated edges.
*
* @param mergeFunc the user defined reduce function which should


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: Fixed error in scaladoc of convertToCanonicalEdges

2015-11-12 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/branch-1.4 72ab06e8a -> 149c4a06d


Fixed error in scaladoc of convertToCanonicalEdges

The code convertToCanonicalEdges is such that srcIds are smaller than dstIds 
but the scaladoc suggested otherwise. Have fixed the same.

Author: Gaurav Kumar 

Closes #9666 from gauravkumar37/patch-1.

(cherry picked from commit df0e318152165c8e50793aff13aaca5d2d9b8b9d)
Signed-off-by: Reynold Xin 


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

Branch: refs/heads/branch-1.4
Commit: 149c4a06da02a9fa060f9385dccffef34c2472d4
Parents: 72ab06e
Author: Gaurav Kumar 
Authored: Thu Nov 12 12:14:00 2015 -0800
Committer: Reynold Xin 
Committed: Thu Nov 12 12:14:26 2015 -0800

--
 graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/149c4a06/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
--
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala 
b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
index 9451ff1..9827dfa 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/GraphOps.scala
@@ -282,7 +282,7 @@ class GraphOps[VD: ClassTag, ED: ClassTag](graph: Graph[VD, 
ED]) extends Seriali
* Convert bi-directional edges into uni-directional ones.
* Some graph algorithms (e.g., TriangleCount) assume that an input graph
* has its edges in canonical direction.
-   * This function rewrites the vertex ids of edges so that srcIds are bigger
+   * This function rewrites the vertex ids of edges so that srcIds are smaller
* than dstIds, and merges the duplicated edges.
*
* @param mergeFunc the user defined reduce function which should


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org