← Back to branch summary

~pwlars/uci-engine/tr-pass-no-tests

~pwlars/uci-engine/tr-pass-no-tests

Viewing all changes in revision 742.

Committer: paul.larson at canonical
Date: 2014-08-12 23:12:36 UTC
mfrom: (740.1.5 uci-engine)
Revision ID: paul.larson@canonical.com-20140812231236-jaulj4b9xr0v6k8y

resolve merge conflicts

files added:
lander/lander/tests/test_status.py

files renamed:
image-builder/imagebuilder/tests/test_modify_cloud_image.py => image-builder/imagebuilder/tests/test_cloud_image.py

files modified:
charms/precise/wsgi-app/hooks/hooks.py

ci-utils/ci_utils/__init__.py

cli/ci_cli/tests/test_cli.py

cli/ci_cli/tests/test_ticket.py

cli/ci_cli/tests/test_utils.py

cli/ci_cli/ticket.py

cli/ci_cli/utils.py

cli/ubuntu-ci

image-builder/imagebuilder/cloud_image.py

lander/bin/lander_process_ticket.py

lander/bin/lander_service_wrapper.py

lander/lander/__init__.py

lander/lander/run_worker.py

test_runner/tstrun/run_worker.py

test_runner/tstrun/tests/test_worker.py

tests/test_cli.py

ticket_system/ticket/api.py

ticket_system/ticket/models.py

Show diffs side-by-side

added added

removed removed

charms/precise/wsgi-app/hooks/hooks.py

ci-utils/ci_utils/__init__.py

cli/ci_cli/tests/test_cli.py

cli/ci_cli/tests/test_ticket.py

cli/ci_cli/tests/test_utils.py

cli/ci_cli/ticket.py

cli/ci_cli/utils.py

image-builder/imagebuilder/cloud_image.py

image-builder/imagebuilder/tests/test_cloud_image.py

lander/bin/lander_process_ticket.py

lander/bin/lander_service_wrapper.py

lander/lander/__init__.py

lander/lander/run_worker.py

lander/lander/tests/test_status.py

test_runner/tstrun/run_worker.py

test_runner/tstrun/tests/test_worker.py

tests/test_cli.py

ticket_system/ticket/api.py

ticket_system/ticket/models.py

Older »