Merge lp://qastaging/~jamesodhunt/ubuntu-system-image/rename-userdata-to-writable-for-core into lp://qastaging/~registry/ubuntu-system-image/client
Proposed by
James Hunt
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~jamesodhunt/ubuntu-system-image/rename-userdata-to-writable-for-core |
| Merge into: | lp://qastaging/~registry/ubuntu-system-image/client |
| Diff against target: |
7662 lines (+7520/-0) (has conflicts) 25 files modified
.bzrignore (+9/-0) README (+23/-0) bin/copy-image (+308/-0) bin/generate-keyrings (+87/-0) bin/generate-keys (+61/-0) bin/import-images (+305/-0) bin/set-phased-percentage (+90/-0) bin/si-shell (+79/-0) etc/config.example (+48/-0) lib/systemimage/config.py (+206/-0) lib/systemimage/diff.py (+245/-0) lib/systemimage/generators.py (+1297/-0) lib/systemimage/gpg.py (+239/-0) lib/systemimage/tools.py (+372/-0) lib/systemimage/tree.py (+1013/-0) tests/generate-keys (+52/-0) tests/run (+60/-0) tests/test_config.py (+281/-0) tests/test_diff.py (+279/-0) tests/test_generators.py (+1135/-0) tests/test_gpg.py (+164/-0) tests/test_static.py (+78/-0) tests/test_tools.py (+303/-0) tests/test_tree.py (+689/-0) utils/check-latest (+97/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. |
| To merge this branch: | bzr merge lp://qastaging/~jamesodhunt/ubuntu-system-image/rename-userdata-to-writable-for-core |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Registry Administrators | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-11-28.
Description of the change
This change is required for Ubuntu Core.
To post a comment you must log in.
Unmerged revisions
- 254. By James Hunt
-
* lib/systemimage
/generators. py: For clarity, Core now uses /writable,
rather than /userdata. - 253. By Stéphane Graber
-
Add support for azure_amd64
- 252. By Stéphane Graber
-
Let's actually use keyring_name in repack_
recovery_ keyring - 251. By Stéphane Graber
-
Add cdimage_device_raw
- 250. By Stéphane Graber
-
Prevent change_
channel_ alias on a redirect channel - 249. By Stéphane Graber
-
Introduce list_devices
- 248. By Stéphane Graber
-
Add cdimage-custom generator.
- 247. By Stéphane Graber
-
Properly support unicode filenames in diffs.
- 246. By Stéphane Graber
-
Update bzrignore
- 245. By Stéphane Graber
-
Drop system/
android/ cache/recovery from core image.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
