← Back to branch summary

~allenap/maas-test/checkbox-runner

~allenap/maas-test/checkbox-runner

Viewing all changes in revision 74.

Committer: Gavin Panella
Date: 2013-11-27 17:56:26 UTC
mfrom: (58.1.19 dry-run)
Revision ID: gavin.panella@canonical.com-20131127175626-mfy2osfxouq3alxc

Merged dry-run into checkbox-runner, resolving conflicts.

files added:
man/maas-test.8

files removed:
man/maas-test.8

files modified:
Makefile

docs/man/maas-test.8.rst

maastest/cases.py

maastest/kvmfixture.py

maastest/maasfixture.py

maastest/main.py

maastest/parser.py

maastest/proxyfixture.py

maastest/tests/test_kvmfixture.py

maastest/tests/test_maasfixture.py

maastest/tests/test_proxyfixture.py

Show diffs side-by-side

added added

removed removed

docs/man/maas-test.8.rst

maastest/cases.py

maastest/kvmfixture.py

maastest/maasfixture.py

maastest/main.py

maastest/parser.py

maastest/proxyfixture.py

maastest/tests/test_kvmfixture.py

maastest/tests/test_maasfixture.py

maastest/tests/test_proxyfixture.py

man/maas-test.8

man/maas-test.8

Older »