← Back to branch summary

~canonical-ci-engineering/core-image-tester/trunk

~canonical-ci-engineering/core-image-tester/trunk

Viewing all changes in revision 25.2.2.

Committer: Thomi Richards
Date: 2015-04-08 00:07:26 UTC
mfrom: (27 core-image-tester)
mto: This revision was merged to the branch mainline in revision 28.
Revision ID: thomi.richards@canonical.com-20150408000726-orm8fgv5ciyua4ef

Merged trunk, resolved conflicts.

files modified:
called-by-tarmac.py

core_image_tester/tests/test_queue_integration.py

core_image_tester/worker.py

setup.py

test_requirements.txt

Show diffs side-by-side

added added

removed removed

called-by-tarmac.py

core_image_tester/tests/test_queue_integration.py

core_image_tester/worker.py

test_requirements.txt

Older »