Merge lp://qastaging/~xnox/system-service/pac-support into lp://qastaging/system-service
Proposed by
Dimitri John Ledkov
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~xnox/system-service/pac-support |
| Merge into: | lp://qastaging/system-service |
| Prerequisite: | lp://qastaging/~xnox/system-service/python3 |
| Diff against target: |
71 lines (+13/-11) 3 files modified
UbuntuSystemService/backend.py (+9/-9) debian/changelog (+3/-1) test/interactive/test_dbus (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~xnox/system-service/pac-support |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Iain Lane | Needs Fixing | ||
| Martin Pitt | Pending | ||
| Michael Vogt | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-12-07.
To post a comment you must log in.
Unmerged revisions
- 77. By Dimitri John Ledkov
-
Add support for auto_proxy (Proxy auto-config)
- 76. By Dimitri John Ledkov
-
Clean-up unused imports
- 75. By Dimitri John Ledkov
-
port system-service-d to python3.
- 74. By Dimitri John Ledkov
-
Port to python3.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks, but there are conflicts with trunk, please resolve.