← Back to branch summary

~allenap/maas-test/configure-abstract

~allenap/maas-test/configure-abstract

Viewing all changes in revision 70.

Committer: Gavin Panella
Date: 2013-11-27 10:07:42 UTC
mfrom: (39.1.35 trunk)
Revision ID: gavin.panella@canonical.com-20131127100742-wd8fru0v009rin7i

Merge trunk, resolving conflicts.

files added:
man/maas-test.8

files removed:
man/maas-test.8

files modified:
Makefile

maastest/cases.py

maastest/maasfixture.py

maastest/parser.py

maastest/proxyfixture.py

maastest/tests/test_maasfixture.py

maastest/tests/test_proxyfixture.py

Show diffs side-by-side

added added

removed removed

maastest/cases.py

maastest/maasfixture.py

maastest/parser.py

maastest/proxyfixture.py

maastest/tests/test_maasfixture.py

maastest/tests/test_proxyfixture.py

man/maas-test.8

man/maas-test.8

Older »