← Back to branch summary

~allenap/maas-test/checkbox-ahoy

~allenap/maas-test/checkbox-ahoy

Viewing all changes in revision 47.

Committer: Gavin Panella
Date: 2013-11-18 22:48:30 UTC
mfrom: (35.2.4 trunk)
Revision ID: gavin.panella@canonical.com-20131118224830-jhmkkfosyhibtbug

Merge trunk, resolving one trivial conflict.

files modified:
maastest/kvmfixture.py

maastest/maasfixture.py

maastest/main.py

maastest/tests/test_kvmfixture.py

maastest/tests/test_maasfixture.py

packages.txt

Show diffs side-by-side

added added

removed removed

maastest/kvmfixture.py

maastest/maasfixture.py

maastest/main.py

maastest/tests/test_kvmfixture.py

maastest/tests/test_maasfixture.py

Older »