Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B41B7200D34 for ; Fri, 3 Nov 2017 08:40:26 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B2881160BE9; Fri, 3 Nov 2017 07:40:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 04216160BFB for ; Fri, 3 Nov 2017 08:40:25 +0100 (CET) Received: (qmail 93460 invoked by uid 500); 3 Nov 2017 07:40:25 -0000 Mailing-List: contact commits-help@bookkeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bookkeeper-dev@bookkeeper.apache.org Delivered-To: mailing list commits@bookkeeper.apache.org Received: (qmail 93451 invoked by uid 99); 3 Nov 2017 07:40:25 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2017 07:40:25 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 7FBA181AAA; Fri, 3 Nov 2017 07:40:22 +0000 (UTC) Date: Fri, 03 Nov 2017 07:40:22 +0000 To: "commits@bookkeeper.apache.org" Subject: [bookkeeper] branch master updated: ISSUE #685: Merge script: make DEV_BRANCH_NAME configurable MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <150969482253.7035.6406709700113327068@gitbox.apache.org> From: eolivelli@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: bookkeeper X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 952cedac10da487c72b7974152242dbc46349978 X-Git-Newrev: 4c2e90d2536676f14df944c5d8b4288362aa48b9 X-Git-Rev: 4c2e90d2536676f14df944c5d8b4288362aa48b9 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Fri, 03 Nov 2017 07:40:26 -0000 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 AuthorDate: Fri Nov 3 08:40:13 2017 +0100 ISSUE #685: Merge script: make DEV_BRANCH_NAME configurable Author: Enrico Olivelli Reviewers: Jia Zhai , Sijie Guo 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 ['"commits@bookkeeper.apache.org" '].