Merge lp://staging/~mbp/kanban/718564-edge into lp://staging/kanban
Proposed by
Martin Pool
| Status: | Merged |
|---|---|
| Approved by: | Jamu Kakar |
| Approved revision: | 23 |
| Merged at revision: | 22 |
| Proposed branch: | lp://staging/~mbp/kanban/718564-edge |
| Merge into: | lp://staging/kanban |
| Diff against target: |
44 lines (+6/-7) 2 files modified
kanban/commands.py (+4/-3) kanban/launchpad.py (+2/-4) |
| To merge this branch: | bzr merge lp://staging/~mbp/kanban/718564-edge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jamu Kakar | Approve | ||
|
Review via email:
|
|||
Description of the change
It turns out my previous branch didn't catch the other occurrence, and the way it did the first part was over-complicated. Take 2.
To post a comment you must log in.
Revision history for this message
| Martin Pool (mbp) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
[1]
- get_person_
+ get_person_
+ SERVICE_ROOT)
Would you mind putting the new import on the same line as
get_person_
please?
[2]
from launchpadlib.
The existing EDGE_SERVICE_ROOT import is no longer used. Can you
please remove it?
When you merge, can you please write a merge commit message using the
following format. You can see examples of it in the log for trunk.
"""
Merged $branch-name [r=$reviewer] [f=$bug-number]
$changeset-
"""
Thanks for cleaning this up, +1!