Merge-o-Matic

Merge lp:~vorlon/merge-o-matic/teams-in-json into lp:merge-o-matic

  1. teams-in-json
  2. Merge into trunk
Proposed by Steve Langasek
Status: Merged
Merged at revision: 341
Proposed branch: lp:~vorlon/merge-o-matic/teams-in-json
Merge into: lp:merge-o-matic
Diff against target: 11 lines (+1/-0)
1 file modified
merge-status.py (+1/-0)
To merge this branch: bzr merge lp:~vorlon/merge-o-matic/teams-in-json
Reviewer Review Type Date Requested Status
Brian Murray Pending
Ubuntu Core Development Team Pending
Review via email: mp+366955@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

Teams is actually a set which doesn't work well when exporting to json so I had to convert it to a list.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'merge-status.py'
2--- merge-status.py 2019-01-25 20:22:30 +0000
3+++ merge-status.py 2019-05-05 04:22:48 +0000
4@@ -684,6 +684,7 @@
5 "age": age,
6 "user": who,
7 "uploader": u_who,
8+ "teams": teams,
9 "binaries": binaries,
10 "base_version": "%s" % base_version,
11 "left_version": "%s" % left_version,

Subscribers

People subscribed via source and target branches

to status/vote changes: