Merge lp://qastaging/~barry/ubuntu-system-image/server-si30-configd into lp://qastaging/~registry/ubuntu-system-image/client
Proposed by
Barry Warsaw
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~barry/ubuntu-system-image/server-si30-configd |
| Merge into: | lp://qastaging/~registry/ubuntu-system-image/client |
| Prerequisite: | lp://qastaging/~registry/ubuntu-system-image/server-toxify |
| Diff against target: |
103 lines (+55/-2) (has conflicts) 5 files modified
README.rst (+12/-0) bin/copy-image (+1/-1) bin/si-shell (+1/-1) lib/systemimage/tests/test_tools.py (+18/-0) lib/systemimage/tools.py (+23/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file README.rst. Moved existing file to README.rst.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. Conflict adding file tools. Moved existing file to tools.moved. Conflict adding file tox.ini. Moved existing file to tox.ini.moved. Conflict adding file unittest.cfg. Moved existing file to unittest.cfg.moved. |
| To merge this branch: | bzr merge lp://qastaging/~barry/ubuntu-system-image/server-si30-configd |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Steve Langasek (community) | Needs Information | ||
| Stéphane Graber | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2015-04-28.
Description of the change
* Add support for system-image client 3.0 via symlinks from config.d.
* Add some helpful links to README.rst
* Fix some typos.
To post a comment you must log in.
Revision history for this message
| Barry Warsaw (barry) wrote | # |
Revision history for this message
| Barry Warsaw (barry) wrote | # |
Revision history for this message
| Barry Warsaw (barry) wrote | # |
Unmerged revisions
- 278. By Barry Warsaw
-
Undo a change that doesn't really help.
- 277. By Barry Warsaw
-
Fix the test.
- 276. By Barry Warsaw
-
* Use relative paths for the etc/system-
image/config. d symlinks
* Provide some better debugging messages.
* Handle resource management better.
* Watch out for initrd.img not being gzip'd, but LP: #1452856 - 275. By Barry Warsaw
-
Trunk merge
- 274. By Barry Warsaw
-
Merge latest toxify branch.
- 273. By Barry Warsaw
-
Quote styles.
- 272. By Barry Warsaw
-
toxify branch merge
- 271. By Barry Warsaw
-
* Add support for system-image client 3.0 via symlinks from config.d.
* Add some helpful links to README.rst
* Fix some typos. - 270. By Barry Warsaw
-
Try to adopt project's quote-style.
- 269. By Barry Warsaw
-
trunk merge
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I think the conflicts are because the prereq branch moves some things around. Probably best to merge that first, and then resubmit this against trunk.