← Back to branch summary

~raharper/curtin/trunk.vmtest-remove-bug-timers

~raharper/curtin/trunk.vmtest-remove-bug-timers

Viewing all changes in revision 539.

Committer: Ryan Harper
Date: 2017-10-05 21:13:05 UTC
Revision ID: ryan.harper@canonical.com-20171005211305-f7e8uoabe9rhm7ds

Fix up merge issues

files modified:
tests/vmtests/test_network_bonding.py

tests/vmtests/test_network_bridging.py

tests/vmtests/test_network_vlan.py

Show diffs side-by-side

added added

removed removed

tests/vmtests/test_network_bonding.py

tests/vmtests/test_network_bridging.py

tests/vmtests/test_network_vlan.py

Older »