← Back to branch summary

~allenap/maas-test/configure-abstract

~allenap/maas-test/configure-abstract

Viewing all changes in revision 50.

Committer: Gavin Panella
Date: 2013-11-24 11:37:10 UTC
mfrom: (39.1.14 maas-test)
Revision ID: gavin.panella@canonical.com-20131124113710-bqa32b2wjgz6ndz9

Merge trunk, resolving lots of conflicts.

files added:
docs

docs/man

docs/man/maas-test.8.rst

maastest/parser.py

man

files modified:
.bzrignore

Makefile

maastest/cases.py

maastest/kvmfixture.py

maastest/maasfixture.py

maastest/main.py

maastest/tests/test_kvmfixture.py

maastest/tests/test_maasfixture.py

maastest/tests/test_utils.py

maastest/utils.py

requirements.txt

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/tests/test_kvmfixture.py

maastest/tests/test_maasfixture.py

maastest/tests/test_utils.py

maastest/utils.py

requirements.txt

Older »