You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2016/06/01 07:04:50 UTC

incubator-zeppelin git commit: [MINOR] fixed a logic to find issue number from title

Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master f8bc54b83 -> 8a409a029


[MINOR] fixed a logic to find issue number from title

### What is this PR for?
Changed the regex to find a issue number from title. This doesn't change any code about Zeppelin, but this will effect helper script for committers

### What type of PR is it?
[Bug Fix]

### Todos
* [x] - Fixed the bug

### What is the Jira issue?
N/A

### How should this be tested?
```
>>> import re
>>> re.findall("ZEPPELIN-[0-9]{3,4}", "ZEPPELIN-123")
['ZEPPELIN-123']
>>> re.findall("ZEPPELIN-[0-9]{4,5}", "ZEPPELIN-123")
[]
>>> re.findall("ZEPPELIN-[0-9]{3,4,5}", "ZEPPELIN-123")
[]
>>> re.findall("ZEPPELIN-[0-9]{3}", "ZEPPELIN-123")
['ZEPPELIN-123']
>>> re.findall("ZEPPELIN-[0-9]{3,5}", "ZEPPELIN-123")
['ZEPPELIN-123']
>>> re.findall("ZEPPELIN-[0-9]{4,5}", "ZEPPELIN-123")
[]
>>> re.findall("ZEPPELIN-[0-9]{3,5}", "ZEPPELIN-123")
['ZEPPELIN-123']
```

### Screenshots (if appropriate)
N/A

### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Jongyoul Lee <jo...@gmail.com>

Closes #936 from jongyoul/minor-find-issue-number-from-title and squashes the following commits:

63f37af [Jongyoul Lee] [MINOR] fixed logic to find issue number from title
c16117b [Jongyoul Lee] [MINOR] fixed logic to find issue number from title


Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/8a409a02
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/8a409a02
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/8a409a02

Branch: refs/heads/master
Commit: 8a409a0297fe44c34fbaf52369305dd7fc6c914e
Parents: f8bc54b
Author: Jongyoul Lee <jo...@gmail.com>
Authored: Tue May 31 15:40:33 2016 +0900
Committer: Jongyoul Lee <jo...@apache.org>
Committed: Wed Jun 1 16:04:32 2016 +0900

----------------------------------------------------------------------
 dev/merge_zeppelin_pr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/8a409a02/dev/merge_zeppelin_pr.py
----------------------------------------------------------------------
diff --git a/dev/merge_zeppelin_pr.py b/dev/merge_zeppelin_pr.py
index d698157..589589c 100755
--- a/dev/merge_zeppelin_pr.py
+++ b/dev/merge_zeppelin_pr.py
@@ -280,7 +280,7 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
 
 
 def resolve_jira_issues(title, merge_branches, comment):
-    jira_ids = re.findall("ZEPPELIN-[0-9]{4,5}", title)
+    jira_ids = re.findall("ZEPPELIN-[0-9]{3,5}", title)
 
     if len(jira_ids) == 0:
         resolve_jira_issue(merge_branches, comment)