This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 4c2e90d ISSUE #685: Merge script: make DEV_BRANCH_NAME configurable
4c2e90d is described below
commit 4c2e90d2536676f14df944c5d8b4288362aa48b9
Author: Enrico Olivelli <[email protected]>
AuthorDate: Fri Nov 3 08:40:13 2017 +0100
ISSUE #685: Merge script: make DEV_BRANCH_NAME configurable
Author: Enrico Olivelli <[email protected]>
Reviewers: Jia Zhai <None>, Sijie Guo <[email protected]>
This closes #686 from eolivelli/fix/issue-683-merge-other-branch, closes
#685
---
dev/bk-merge-pr.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev/bk-merge-pr.py b/dev/bk-merge-pr.py
index 9e1ba80..e067c19 100755
--- a/dev/bk-merge-pr.py
+++ b/dev/bk-merge-pr.py
@@ -51,6 +51,8 @@ REPO_HOME = os.environ.get("%s_HOME" %
CAPITALIZED_PROJECT_NAME, os.getcwd())
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")
+# Reference branch name
+DEV_BRANCH_NAME = = os.environ.get("DEV_BRANCH_NAME", "master")
# ASF JIRA username
JIRA_USERNAME = os.environ.get("JIRA_USERNAME", "")
# ASF JIRA password
@@ -71,8 +73,6 @@ JIRA_API_BASE = "https://issues.apache.org/jira";
TEMP_BRANCH_PREFIX = "PR_TOOL"
RELEASE_BRANCH_PREFIX = "branch-"
-DEV_BRANCH_NAME = "master"
-
DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "0.9.1.0")
def get_json(url, preview_api = False):
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
