Repository: spark Updated Branches: refs/heads/master 46dff3445 -> 4ba3f70a4
SPARK-1151: Update dev merge script to use spark.git instead of incubator-spark Author: Thomas Graves <[email protected]> Closes #47 from tgravescs/fix_merge_script and squashes the following commits: 8209ab1 [Thomas Graves] Update dev merge script to use spark.git instead of incubator-spark Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4ba3f70a Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4ba3f70a Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4ba3f70a Branch: refs/heads/master Commit: 4ba3f70a4e385368d0e826ba261f8eb60c25c896 Parents: 46dff34 Author: Thomas Graves <[email protected]> Authored: Fri Feb 28 18:28:33 2014 -0800 Committer: Patrick Wendell <[email protected]> Committed: Fri Feb 28 18:28:33 2014 -0800 ---------------------------------------------------------------------- dev/merge_spark_pr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/4ba3f70a/dev/merge_spark_pr.py ---------------------------------------------------------------------- diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py index 93621c9..e8f78fc 100755 --- a/dev/merge_spark_pr.py +++ b/dev/merge_spark_pr.py @@ -38,7 +38,7 @@ PR_REMOTE_NAME = os.environ.get("PR_REMOTE_NAME", "apache-github") # Remote name which points to Apache git PUSH_REMOTE_NAME = os.environ.get("PUSH_REMOTE_NAME", "apache") -GIT_API_BASE = "https://api.github.com/repos/apache/incubator-spark"; +GIT_API_BASE = "https://api.github.com/repos/apache/spark"; # Prefix added to temporary branches BRANCH_PREFIX = "PR_TOOL"
