srowen closed pull request #164: Suggest new Apache repo for committers URL: https://github.com/apache/spark-website/pull/164
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/committers.md b/committers.md index 0824b26cb..0eaad06e0 100644 --- a/committers.md +++ b/committers.md @@ -130,9 +130,9 @@ it. So please don't add any test commits or anything like that, only real patche All merges should be done using the [dev/merge_spark_pr.py](https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py) script, which squashes the pull request's changes into one commit. To use this script, you -will need to add a git remote called "apache" at https://git-wip-us.apache.org/repos/asf/spark.git, +will need to add a git remote called `apache` at `https://github.com/apache/spark`, as well as one called "apache-github" at `git://github.com/apache/spark`. For the `apache` repo, -you can authenticate using your ASF username and password. Ask Patrick if you have trouble with +you can authenticate using your ASF username and password. Ask `dev@spark.apache.org` if you have trouble with this or want help doing your first merge. The script is fairly self explanatory and walks you through steps and options interactively. diff --git a/site/committers.html b/site/committers.html index 5843c0da8..3771ba93a 100644 --- a/site/committers.html +++ b/site/committers.html @@ -535,9 +535,9 @@ <h3>How to Merge a Pull Request</h3> <p>All merges should be done using the <a href="https://github.com/apache/spark/blob/master/dev/merge_spark_pr.py";>dev/merge_spark_pr.py</a> script, which squashes the pull request’s changes into one commit. To use this script, you -will need to add a git remote called “apache” at https://git-wip-us.apache.org/repos/asf/spark.git, +will need to add a git remote called <code>apache</code> at <code>https://github.com/apache/spark</code>, as well as one called “apache-github” at <code>git://github.com/apache/spark</code>. For the <code>apache</code> repo, -you can authenticate using your ASF username and password. Ask Patrick if you have trouble with +you can authenticate using your ASF username and password. Ask <code>dev@spark.apache.org</code> if you have trouble with this or want help doing your first merge.</p> <p>The script is fairly self explanatory and walks you through steps and options interactively.</p> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe e-mail: dev-unsubscr...@spark.apache.org
