You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@distributedlog.apache.org by si...@apache.org on 2017/06/21 17:17:50 UTC
incubator-distributedlog git commit: Fix merge script issues
Repository: incubator-distributedlog
Updated Branches:
refs/heads/master 0cb775c93 -> 0f4ea2816
Fix merge script issues
Problem:
Currently the merge script is broken when the reviewer's id is not in reviewers list.
Solution:
- Change "reviewers[reviewer_id]" to "reviewer_id in reviewers"
- Bump the default version to 0.5.0.
Author: Sijie Guo <si...@apache.org>
Reviewers: Jia Zhai <None>
Closes #134 from sijie/fix_merge_script_issues
Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/0f4ea281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/0f4ea281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/0f4ea281
Branch: refs/heads/master
Commit: 0f4ea2816324e9c918fdf35589f34a472ba9c89f
Parents: 0cb775c
Author: Sijie Guo <si...@apache.org>
Authored: Wed Jun 21 10:17:46 2017 -0700
Committer: Sijie Guo <si...@apache.org>
Committed: Wed Jun 21 10:17:46 2017 -0700
----------------------------------------------------------------------
scripts/dev/dl-merge-pr.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/0f4ea281/scripts/dev/dl-merge-pr.py
----------------------------------------------------------------------
diff --git a/scripts/dev/dl-merge-pr.py b/scripts/dev/dl-merge-pr.py
index 6c9d3e8..a669fd4 100755
--- a/scripts/dev/dl-merge-pr.py
+++ b/scripts/dev/dl-merge-pr.py
@@ -84,7 +84,7 @@ TEMP_BRANCH_PREFIX = 'PR_TOOL'
RELEASE_BRANCH_PREFIX = ''
DEV_BRANCH_NAME = 'master'
-DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "0.4.0")
+DEFAULT_FIX_VERSION = os.environ.get("DEFAULT_FIX_VERSION", "0.5.0")
def get_json(url, preview_api = False):
"""
@@ -450,7 +450,7 @@ def get_reviewers(pr_num):
for reviewer_id in reviewers_ids:
username = None
useremail = None
- if reviewers[reviewer_id] is not None:
+ if reviewer_id in reviewers:
reviewer = reviewers[reviewer_id]
username = reviewer['name']
useremail = reviewer['email']