Merge lp://qastaging/~dobey/ubuntu/natty/ubuntuone-control-panel/release-0-8-3 into lp://qastaging/ubuntu/natty/ubuntuone-control-panel
Proposed by
dobey
| Status: | Merged |
|---|---|
| Merged at revision: | 12 |
| Proposed branch: | lp://qastaging/~dobey/ubuntu/natty/ubuntuone-control-panel/release-0-8-3 |
| Merge into: | lp://qastaging/ubuntu/natty/ubuntuone-control-panel |
| Diff against target: |
2036 lines (+930/-264) 19 files modified
PKG-INFO (+23/-1) data/device.ui (+1/-1) data/management.ui (+3/-29) data/overview.ui (+235/-68) data/volumes.ui (+22/-19) debian/changelog (+17/-0) debian/python-ubuntuone-control-panel.install (+4/-1) debian/ubuntuone-control-panel-gtk.install (+2/-1) setup.py (+2/-1) ubuntuone-control-panel-gtk.desktop.in (+1/-0) ubuntuone.controlpanel.pth (+2/-0) ubuntuone/controlpanel/backend.py (+56/-8) ubuntuone/controlpanel/dbus_client.py (+43/-2) ubuntuone/controlpanel/gtk/gui.py (+60/-61) ubuntuone/controlpanel/gtk/tests/__init__.py (+2/-2) ubuntuone/controlpanel/gtk/tests/test_gui.py (+47/-41) ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py (+184/-4) ubuntuone/controlpanel/tests/__init__.py (+79/-3) ubuntuone/controlpanel/tests/test_backend.py (+147/-22) |
| To merge this branch: | bzr merge lp://qastaging/~dobey/ubuntu/natty/ubuntuone-control-panel/release-0-8-3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Approve | ||
|
Review via email:
|
|||
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
Looks good