← Back to branch summary

~matsubara/curtin/rework-vmtests

~matsubara/curtin/rework-vmtests

Viewing all changes in revision 298.

Committer: diogo.matsubara at canonical
Date: 2015-10-27 11:26:56 UTC
mfrom: (287.2.3 trunk)
Revision ID: diogo.matsubara@canonical.com-20151027112656-j5wtmf2sro3yjn8m

merge from trunk, solved 2 conflicts

files modified:
curtin/__init__.py

curtin/commands/block_meta.py

curtin/util.py

doc/devel/README-vmtest.txt

examples/tests/allindata.yaml

examples/tests/raid6boot.yaml

tests/vmtests/__init__.py

tests/vmtests/test_lvm.py

tests/vmtests/test_mdadm_bcache.py

tools/launch

Show diffs side-by-side

added added

removed removed

curtin/__init__.py

curtin/commands/block_meta.py

doc/devel/README-vmtest.txt

examples/tests/allindata.yaml

examples/tests/raid6boot.yaml

tests/vmtests/__init__.py

tests/vmtests/test_lvm.py

tests/vmtests/test_mdadm_bcache.py

Older »