Merge lp://qastaging/~sil2100/ubuntu-system-image/server_lp1463136 into lp://qastaging/ubuntu-system-image/server
Proposed by
Łukasz Zemczak
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Zemczak |
| Approved revision: | 283 |
| Merged at revision: | 283 |
| Proposed branch: | lp://qastaging/~sil2100/ubuntu-system-image/server_lp1463136 |
| Merge into: | lp://qastaging/ubuntu-system-image/server |
| Diff against target: |
72 lines (+11/-9) 3 files modified
lib/systemimage/generators.py (+6/-3) lib/systemimage/tests/test_tools.py (+3/-4) lib/systemimage/tools.py (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~sil2100/ubuntu-system-image/server_lp1463136 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Barry Warsaw (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Change the path where the archive-master key file is being held for s-i 3.0+. Add some fixes for pep8 cleanness.
Description of the change
Change the path where the archive-master key file is being held for s-i 3.0+. Add some fixes for pep8 cleanness.
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
LGTM