[GitHub] eolivelli closed pull request #686: Issue-685 Merge script: make DEV_BRANCH_NAME configurable

[GitBox <gi...@apache.org>]

eolivelli closed pull request #686: Issue-685 Merge script: make DEV_BRANCH_NAME configurable
URL: https://github.com/apache/bookkeeper/pull/686
 
 
   

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/dev/bk-merge-pr.py b/dev/bk-merge-pr.py
index 9e1ba8021..e067c1999 100755
--- a/dev/bk-merge-pr.py
+++ b/dev/bk-merge-pr.py
@@ -51,6 +51,8 @@
 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 @@
 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):


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services