Repository: spark Updated Branches: refs/heads/branch-1.1 91eadd2d8 -> f333e4f27
[SPARK-4686] Link to allowed master URLs is broken The link points to the old scala programming guide; it should point to the submitting applications page. This should be backported to 1.1.2 (it's been broken as of 1.0). Author: Kay Ousterhout <kayousterh...@gmail.com> Closes #3542 from kayousterhout/SPARK-4686 and squashes the following commits: a8fc43b [Kay Ousterhout] [SPARK-4686] Link to allowed master URLs is broken (cherry picked from commit d9a148ba6a67a01e4bf77c35c41dd4cbc8918c82) Signed-off-by: Kay Ousterhout <kayousterh...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f333e4f2 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f333e4f2 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f333e4f2 Branch: refs/heads/branch-1.1 Commit: f333e4f278851e4c28197fefdee68a0e88ca0126 Parents: 91eadd2 Author: Kay Ousterhout <kayousterh...@gmail.com> Authored: Tue Dec 2 09:06:02 2014 -0800 Committer: Kay Ousterhout <kayousterh...@gmail.com> Committed: Tue Dec 2 09:07:32 2014 -0800 ---------------------------------------------------------------------- docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/f333e4f2/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 335650d..13fc251 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -92,7 +92,7 @@ of the most common options to set are: <td>(none)</td> <td> The cluster manager to connect to. See the list of - <a href="scala-programming-guide.html#master-urls"> allowed master URL's</a>. + <a href="submitting-applications.html#master-urls"> allowed master URL's</a>. </td> </tr> <tr> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
