Merge lp://staging/~raharper/ubuntu/yakkety/curtin/pkg into lp://staging/~smoser/ubuntu/yakkety/curtin/pkg
| Status: | Merged |
|---|---|
| Merged at revision: | 59 |
| Proposed branch: | lp://staging/~raharper/ubuntu/yakkety/curtin/pkg |
| Merge into: | lp://staging/~smoser/ubuntu/yakkety/curtin/pkg |
| Diff against target: |
9024 lines (+5935/-1556) 69 files modified
Makefile (+3/-1) curtin/__init__.py (+2/-0) curtin/block/__init__.py (+176/-47) curtin/block/clear_holders.py (+387/-0) curtin/block/lvm.py (+96/-0) curtin/block/mdadm.py (+18/-5) curtin/commands/apply_net.py (+156/-1) curtin/commands/apt_config.py (+11/-9) curtin/commands/block_info.py (+75/-0) curtin/commands/block_meta.py (+82/-203) curtin/commands/block_wipe.py (+0/-1) curtin/commands/clear_holders.py (+48/-0) curtin/commands/curthooks.py (+4/-51) curtin/commands/main.py (+4/-3) curtin/config.py (+2/-3) curtin/net/__init__.py (+67/-30) curtin/net/network_state.py (+45/-1) curtin/util.py (+45/-8) debian/changelog (+16/-2) doc/conf.py (+21/-4) doc/devel/README-vmtest.txt (+0/-221) doc/devel/README.txt (+0/-55) doc/devel/clear_holders_doc.txt (+85/-0) doc/index.rst (+6/-0) doc/topics/apt_source.rst (+26/-20) doc/topics/config.rst (+551/-0) doc/topics/development.rst (+68/-0) doc/topics/integration-testing.rst (+245/-0) doc/topics/networking.rst (+522/-0) doc/topics/overview.rst (+7/-7) doc/topics/reporting.rst (+3/-3) doc/topics/storage.rst (+894/-0) examples/network-ipv6-bond-vlan.yaml (+56/-0) examples/tests/basic_network_static_ipv6.yaml (+22/-0) examples/tests/network_alias.yaml (+125/-0) examples/tests/network_mtu.yaml (+88/-0) examples/tests/network_source_ipv6.yaml (+31/-0) examples/tests/vlan_network_ipv6.yaml (+92/-0) setup.py (+2/-2) tests/unittests/helpers.py (+41/-0) tests/unittests/test_apt_source.py (+17/-3) tests/unittests/test_block.py (+105/-0) tests/unittests/test_block_lvm.py (+94/-0) tests/unittests/test_block_mdadm.py (+28/-23) tests/unittests/test_clear_holders.py (+329/-0) tests/unittests/test_net.py (+54/-13) tests/unittests/test_util.py (+130/-14) tests/vmtests/helpers.py (+129/-166) tests/vmtests/test_basic.py (+19/-40) tests/vmtests/test_bcache_basic.py (+5/-8) tests/vmtests/test_bonding.py (+0/-204) tests/vmtests/test_lvm.py (+2/-1) tests/vmtests/test_mdadm_bcache.py (+21/-17) tests/vmtests/test_multipath.py (+5/-13) tests/vmtests/test_network.py (+205/-348) tests/vmtests/test_network_alias.py (+40/-0) tests/vmtests/test_network_bonding.py (+63/-0) tests/vmtests/test_network_enisource.py (+91/-0) tests/vmtests/test_network_ipv6.py (+53/-0) tests/vmtests/test_network_ipv6_enisource.py (+26/-0) tests/vmtests/test_network_ipv6_static.py (+42/-0) tests/vmtests/test_network_ipv6_vlan.py (+34/-0) tests/vmtests/test_network_mtu.py (+155/-0) tests/vmtests/test_network_static.py (+44/-0) tests/vmtests/test_network_vlan.py (+77/-0) tests/vmtests/test_nvme.py (+2/-1) tests/vmtests/test_raid5_bcache.py (+5/-8) tests/vmtests/test_uefi_basic.py (+15/-17) tox.ini (+23/-3) |
| To merge this branch: | bzr merge lp://staging/~raharper/ubuntu/yakkety/curtin/pkg |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| curtin developers | Pending | ||
|
Review via email:
|
|||
Commit message
* New upstream snapshot.
- unittest,tox.ini: catch and fix issue with trusty-level mock of open
- block/mdadm: add option to ignore mdadm_assemble errors (LP: #1618429)
- curtin/doc: overhaul curtin documentation for readthedocs.org (LP: #1351085)
- curtin.util: re-add support for RunInChroot (LP: #1617375)
- curtin/net: overhaul of eni rendering to handle mixed ipv4/ipv6 configs
- curtin.block: refactor clear_holders logic into block.clear_holders and cli cmd
- curtin.apply_net should exit non-zero upon exception. (LP: #1615780)
- apt: fix bug in disable_suites if sources.list line is blank.
- vmtests: disable Wily in vmtests
- Fix the unittests for test_apt_source.
Description of the change
* New upstream snapshot.
- unittest,tox.ini: catch and fix issue with trusty-level mock of open
- block/mdadm: add option to ignore mdadm_assemble errors (LP: #1618429)
- curtin/doc: overhaul curtin documentation for readthedocs.org (LP: #1351085)
- curtin.util: re-add support for RunInChroot (LP: #1617375)
- curtin/net: overhaul of eni rendering to handle mixed ipv4/ipv6 configs
- curtin.block: refactor clear_holders logic into block.clear_holders and cli cmd
- curtin.apply_net should exit non-zero upon exception. (LP: #1615780)
- apt: fix bug in disable_suites if sources.list line is blank.
- vmtests: disable Wily in vmtests
- Fix the unittests for test_apt_source.
