Merge lp://qastaging/~barry/ubuntu-system-image/lp1277589-udm into lp://qastaging/~registry/ubuntu-system-image/client
Proposed by
Barry Warsaw
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 234 | ||||
| Proposed branch: | lp://qastaging/~barry/ubuntu-system-image/lp1277589-udm | ||||
| Merge into: | lp://qastaging/~registry/ubuntu-system-image/client | ||||
| Diff against target: |
540 lines (+203/-16) 11 files modified
NEWS.rst (+3/-0) systemimage/api.py (+4/-0) systemimage/dbus.py (+35/-3) systemimage/download.py (+35/-1) systemimage/service.py (+2/-1) systemimage/testing/controller.py (+6/-2) systemimage/testing/helpers.py (+8/-5) systemimage/testing/nose.py (+10/-1) systemimage/tests/data/config_03.ini (+1/-1) systemimage/tests/data/index_24.json (+36/-0) systemimage/tests/test_dbus.py (+63/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~barry/ubuntu-system-image/lp1277589-udm | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Registry Administrators | Pending | ||
|
Review via email:
|
|||
Description of the change
More fixes for concurrency protection.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
