spark git commit: [DOCS] Fix typo in return type of cogroup

2015-01-16 Thread andrewor14
Repository: spark
Updated Branches:
  refs/heads/master e200ac8e5 - f6b852aad


[DOCS] Fix typo in return type of cogroup

This fixes a simple typo in the cogroup docs noted in 
http://mail-archives.apache.org/mod_mbox/spark-user/201501.mbox/%3CCAMAsSdJ8_24evMAMg7fOZCQjwimisbYWa9v8BN6Rc3JCauja6wmail.gmail.com%3E

I didn't bother with a JIRA

Author: Sean Owen so...@cloudera.com

Closes #4072 from srowen/CogroupDocFix and squashes the following commits:

43c850b [Sean Owen] Fix typo in return type of cogroup


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

Branch: refs/heads/master
Commit: f6b852aade7668c99f37c69f606c64763cb265d2
Parents: e200ac8
Author: Sean Owen so...@cloudera.com
Authored: Fri Jan 16 09:28:44 2015 -0800
Committer: Andrew Or and...@databricks.com
Committed: Fri Jan 16 09:28:44 2015 -0800

--
 docs/programming-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/f6b852aa/docs/programming-guide.md
--
diff --git a/docs/programming-guide.md b/docs/programming-guide.md
index 5e0d5c1..0211bba 100644
--- a/docs/programming-guide.md
+++ b/docs/programming-guide.md
@@ -913,7 +913,7 @@ for details.
 /tr
 tr
   td bcogroup/b(iotherDataset/i, [inumTasks/i]) /td
-  td When called on datasets of type (K, V) and (K, W), returns a dataset of 
(K, Iterablelt;Vgt;, Iterablelt;Wgt;) tuples. This operation is also called 
codegroupWith/code. /td
+  td When called on datasets of type (K, V) and (K, W), returns a dataset of 
(K, (Iterablelt;Vgt;, Iterablelt;Wgt;)) tuples. This operation is also 
called codegroupWith/code. /td
 /tr
 tr
   td bcartesian/b(iotherDataset/i) /td


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



spark git commit: [DOCS] Fix typo in return type of cogroup

2015-01-16 Thread andrewor14
Repository: spark
Updated Branches:
  refs/heads/branch-1.1 810a2248f - c411182c6


[DOCS] Fix typo in return type of cogroup

This fixes a simple typo in the cogroup docs noted in 
http://mail-archives.apache.org/mod_mbox/spark-user/201501.mbox/%3CCAMAsSdJ8_24evMAMg7fOZCQjwimisbYWa9v8BN6Rc3JCauja6wmail.gmail.com%3E

I didn't bother with a JIRA

Author: Sean Owen so...@cloudera.com

Closes #4072 from srowen/CogroupDocFix and squashes the following commits:

43c850b [Sean Owen] Fix typo in return type of cogroup

(cherry picked from commit f6b852aade7668c99f37c69f606c64763cb265d2)
Signed-off-by: Andrew Or and...@databricks.com


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

Branch: refs/heads/branch-1.1
Commit: c411182c640940fe577c0529d2df0d2cd7fc0718
Parents: 810a224
Author: Sean Owen so...@cloudera.com
Authored: Fri Jan 16 09:28:44 2015 -0800
Committer: Andrew Or and...@databricks.com
Committed: Fri Jan 16 09:28:59 2015 -0800

--
 docs/programming-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/c411182c/docs/programming-guide.md
--
diff --git a/docs/programming-guide.md b/docs/programming-guide.md
index 6ae780d..999bea0 100644
--- a/docs/programming-guide.md
+++ b/docs/programming-guide.md
@@ -911,7 +911,7 @@ for details.
 /tr
 tr
   td bcogroup/b(iotherDataset/i, [inumTasks/i]) /td
-  td When called on datasets of type (K, V) and (K, W), returns a dataset of 
(K, Iterablelt;Vgt;, Iterablelt;Wgt;) tuples. This operation is also called 
codegroupWith/code. /td
+  td When called on datasets of type (K, V) and (K, W), returns a dataset of 
(K, (Iterablelt;Vgt;, Iterablelt;Wgt;)) tuples. This operation is also 
called codegroupWith/code. /td
 /tr
 tr
   td bcartesian/b(iotherDataset/i) /td


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



spark git commit: [DOCS] Fix typo in return type of cogroup

2015-01-16 Thread andrewor14
Repository: spark
Updated Branches:
  refs/heads/branch-1.0 b530bc92a - a1425db96


[DOCS] Fix typo in return type of cogroup

This fixes a simple typo in the cogroup docs noted in 
http://mail-archives.apache.org/mod_mbox/spark-user/201501.mbox/%3CCAMAsSdJ8_24evMAMg7fOZCQjwimisbYWa9v8BN6Rc3JCauja6wmail.gmail.com%3E

I didn't bother with a JIRA

Author: Sean Owen so...@cloudera.com

Closes #4072 from srowen/CogroupDocFix and squashes the following commits:

43c850b [Sean Owen] Fix typo in return type of cogroup

(cherry picked from commit f6b852aade7668c99f37c69f606c64763cb265d2)
Signed-off-by: Andrew Or and...@databricks.com


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

Branch: refs/heads/branch-1.0
Commit: a1425db96a1126ef326a094eaa8abfa575db4b55
Parents: b530bc9
Author: Sean Owen so...@cloudera.com
Authored: Fri Jan 16 09:28:44 2015 -0800
Committer: Andrew Or and...@databricks.com
Committed: Fri Jan 16 09:29:13 2015 -0800

--
 docs/programming-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/a1425db9/docs/programming-guide.md
--
diff --git a/docs/programming-guide.md b/docs/programming-guide.md
index c04c3fa..7e6c089 100644
--- a/docs/programming-guide.md
+++ b/docs/programming-guide.md
@@ -835,7 +835,7 @@ for details.
 /tr
 tr
   td bcogroup/b(iotherDataset/i, [inumTasks/i]) /td
-  td When called on datasets of type (K, V) and (K, W), returns a dataset of 
(K, Iterablelt;Vgt;, Iterablelt;Wgt;) tuples. This operation is also called 
codegroupWith/code. /td
+  td When called on datasets of type (K, V) and (K, W), returns a dataset of 
(K, (Iterablelt;Vgt;, Iterablelt;Wgt;)) tuples. This operation is also 
called codegroupWith/code. /td
 /tr
 tr
   td bcartesian/b(iotherDataset/i) /td


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