Merge lp://qastaging/~raharper/ubuntu/xenial/curtin/pkg-sru-revno399 into lp://qastaging/~smoser/ubuntu/xenial/curtin/pkg

Proposed by Ryan Harper
Status: Merged
Merged at revision: 51
Proposed branch: lp://qastaging/~raharper/ubuntu/xenial/curtin/pkg-sru-revno399
Merge into: lp://qastaging/~smoser/ubuntu/xenial/curtin/pkg
Diff against target: 2457 lines (+1095/-323)
35 files modified
curtin/block/__init__.py (+9/-3)
curtin/commands/block_meta.py (+7/-2)
curtin/commands/curthooks.py (+19/-3)
curtin/commands/net_meta.py (+39/-28)
curtin/net/__init__.py (+25/-5)
curtin/reporter/handlers.py (+4/-13)
curtin/util.py (+56/-0)
debian/changelog (+19/-0)
examples/tests/basic_network.yaml (+6/-0)
examples/tests/basic_scsi.yaml (+72/-0)
examples/tests/bonding_network.yaml (+2/-0)
examples/tests/multipath.yaml (+38/-0)
examples/tests/simple.yaml (+3/-0)
helpers/common (+14/-6)
tests/unittests/test_net.py (+49/-1)
tests/unittests/test_reporter.py (+23/-2)
tests/vmtests/__init__.py (+121/-58)
tests/vmtests/helpers.py (+169/-0)
tests/vmtests/image_sync.py (+16/-2)
tests/vmtests/releases.py (+5/-0)
tests/vmtests/test_basic.py (+121/-4)
tests/vmtests/test_bcache_basic.py (+4/-0)
tests/vmtests/test_bonding.py (+6/-44)
tests/vmtests/test_lvm.py (+4/-4)
tests/vmtests/test_mdadm_bcache.py (+24/-24)
tests/vmtests/test_multipath.py (+63/-0)
tests/vmtests/test_network.py (+19/-57)
tests/vmtests/test_nvme.py (+4/-4)
tests/vmtests/test_raid5_bcache.py (+8/-4)
tests/vmtests/test_simple.py (+40/-0)
tests/vmtests/test_uefi_basic.py (+8/-8)
tools/jenkins-runner (+10/-0)
tools/launch (+74/-44)
tools/vmtest-sync-images (+5/-1)
tools/xkvm (+9/-6)
To merge this branch: bzr merge lp://qastaging/~raharper/ubuntu/xenial/curtin/pkg-sru-revno399
Reviewer Review Type Date Requested Status
Scott Moser Approve
Review via email: mp+299841@code.qastaging.launchpad.net

Description of the change

SRU'ing revno399 into Xenial

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

i also added the debian/new-upstream-snapshot fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: