You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by gu...@apache.org on 2018/12/05 15:12:54 UTC
griffin git commit: update merge script
Repository: griffin
Updated Branches:
refs/heads/master 9adeb6ea0 -> d9cd1d702
update merge script
Project: http://git-wip-us.apache.org/repos/asf/griffin/repo
Commit: http://git-wip-us.apache.org/repos/asf/griffin/commit/d9cd1d70
Tree: http://git-wip-us.apache.org/repos/asf/griffin/tree/d9cd1d70
Diff: http://git-wip-us.apache.org/repos/asf/griffin/diff/d9cd1d70
Branch: refs/heads/master
Commit: d9cd1d7026556b67c07b9b83834694806ab6eac6
Parents: 9adeb6e
Author: William Guo <gu...@apache.org>
Authored: Wed Dec 5 23:06:50 2018 +0800
Committer: William Guo <gu...@apache.org>
Committed: Wed Dec 5 23:06:50 2018 +0800
----------------------------------------------------------------------
merge_pr.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/griffin/blob/d9cd1d70/merge_pr.py
----------------------------------------------------------------------
diff --git a/merge_pr.py b/merge_pr.py
index e2452a5..88d5358 100755
--- a/merge_pr.py
+++ b/merge_pr.py
@@ -56,15 +56,15 @@ JIRA_PASSWORD = os.environ.get("JIRA_PASSWORD", "")
# https://github.com/settings/tokens. This script only requires the "public_repo" scope.
GITHUB_OAUTH_KEY = os.environ.get("GITHUB_OAUTH_KEY")
-GITHUB_BASE = "https://github.com/apache/incubator-griffin/pull"
-GITHUB_API_BASE = "https://api.github.com/repos/apache/incubator-griffin"
+GITHUB_BASE = "https://github.com/apache/griffin/pull"
+GITHUB_API_BASE = "https://api.github.com/repos/apache/griffin"
JIRA_BASE = "https://issues.apache.org/jira/browse"
JIRA_API_BASE = "https://issues.apache.org/jira"
# Prefix added to temporary branches
BRANCH_PREFIX = "PR_TOOL"
-PR_REPO = "https://github.com/apache/incubator-griffin.git"
-PUSH_REPO = "https://git-wip-us.apache.org/repos/asf/incubator-griffin.git"
+PR_REPO = "https://github.com/apache/griffin.git"
+PUSH_REPO = "https://git-wip-us.apache.org/repos/asf/griffin.git"
def get_json(url):