You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@parquet.apache.org by bl...@apache.org on 2014/12/16 18:56:14 UTC
incubator-parquet-mr git commit: PARQUET-150 Update merge script
issue id matching.
Repository: incubator-parquet-mr
Updated Branches:
refs/heads/master b7a82a918 -> 8e2ea92ee
PARQUET-150 Update merge script issue id matching.
This matches a word boundary after the issue id rather than a colon.
Author: Ryan Blue <bl...@apache.org>
This patch had conflicts when merged, resolved by
Committer: Ryan Blue <bl...@apache.org>
Closes #94 from rdblue/PARQUET-150-update-merge-script and squashes the following commits:
cc39713 [Ryan Blue] PARQUET-150: Update merge script issue id matching.
Project: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/commit/8e2ea92e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/tree/8e2ea92e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/diff/8e2ea92e
Branch: refs/heads/master
Commit: 8e2ea92ee6ed83f74619681fd1158dd081c4dd4e
Parents: b7a82a9
Author: Ryan Blue <bl...@apache.org>
Authored: Tue Dec 16 09:56:02 2014 -0800
Committer: Ryan Blue <bl...@apache.org>
Committed: Tue Dec 16 09:56:02 2014 -0800
----------------------------------------------------------------------
dev/merge_parquet_pr.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/8e2ea92e/dev/merge_parquet_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_parquet_pr.py b/dev/merge_parquet_pr.py
index 524fe9f..ad6010d 100755
--- a/dev/merge_parquet_pr.py
+++ b/dev/merge_parquet_pr.py
@@ -212,7 +212,7 @@ def fix_version_from_branch(branch, versions):
return filter(lambda x: x.name.startswith(branch_ver), versions)[-1]
def exctract_jira_id(title):
- m = re.search('^(PARQUET-[0-9]+):.*$', title)
+ m = re.search(r'^(PARQUET-[0-9]+)\b.*$', title)
if m and m.groups > 0:
return m.group(1)
else: