← Back to branch summary

~vila/uci-engine/prod-britney

~vila/uci-engine/prod-britney

Viewing all changes in revision 925.

Committer: Vincent Ladeuil
Date: 2014-11-13 23:24:45 UTC
mfrom: (894.1.28 tr-cwd)
Revision ID: vila+ci@canonical.com-20141113232445-jki7t17mbjx4h3kx

Merge trunk, resolving conflicts

files added:
nf-stats-service/nfss/scripts

nf-stats-service/nfss/scripts/__init__.py

nf-stats-service/nfss/scripts/nfss_check.py

nf-stats-service/nfss/testing

nf-stats-service/nfss/testing/__init__.py

nf-stats-service/nfss/testing/fake_server.py

nf-stats-service/nfss/testing/fixture_setup.py

nf-stats-service/nfss/tests/__init__.py

nf-stats-service/nfss/tests/scripts

nf-stats-service/nfss/tests/scripts/__init__.py

nf-stats-service/nfss/tests/scripts/test_nfss_check.py

nf-stats-service/nfss/tests/unit/test_fixture_setup.py

ticket_system/ticket/migrations/0019_auto__add_field_review_status__chg_field_review_review_type.py

ticket_system/ticket/migrations/0020_fill_review_status.py

ticket_system/ticket/migrations/0021_auto__del_field_review_completed.py

webui/common/static/common/edit.png

webui/common/static/common/merge-proposal-icon.png

webui/common/static/common/warning.png

webui/tickets/static/tickets/webui_pending_qa.js

webui/tickets/templates/tickets/pending_qa.html

files removed:
cli

cli/ci_cli

cli/ci_cli/__init__.py

cli/ci_cli/image.py

cli/ci_cli/tests

cli/ci_cli/tests/__init__.py

cli/ci_cli/tests/test_cli.py

cli/ci_cli/tests/test_image.py

cli/ci_cli/tests/test_style.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/setup.py

cli/ubuntu-ci

tests/test_cli.py

tests/test_integration.py

files renamed:
webui/tickets/static/tickets/webui_review.js => webui/tickets/static/tickets/webui_ticket_edit.js

webui/tickets/templates/tickets/review.html => webui/tickets/templates/tickets/edit.html

files modified:
bin/called-by-tarmac.py

ci-utils/ci_utils/__init__.py

ci-utils/ci_utils/ticket_states.py

ci-utils/setup.py

debian/control

debian/rules

image-builder/create-nova-adt-image.sh *

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/configs/webui_http_vhost

juju-deployer/test-runner.yaml.tmpl

nf-stats-service/setup.py

test_runner/bin/check_worker.py

test_runner/tstrun/run_worker.py

test_runner/tstrun/tests/__init__.py

test_runner/tstrun/tests/test_testbed.py

test_runner/tstrun/tests/test_worker.py

testing/run_tests.py

testing/venv.py

tests/deployers.py

tests/test_ticket_system.py

tests/test_webui.py

ticket_system/ticket/admin.py

ticket_system/ticket/api.py

ticket_system/ticket/models.py

ticket_system/ticket/tests/test_models.py

ticket_system/ticket/tests/test_read_api.py

ticket_system/ticket/tests/test_user_info.py

ticket_system/ticket/tests/test_write_api.py

ticket_system/ticket_system/urls.py

webui/common/static/common/webui.css

webui/common/static/common/webui_login.js

webui/common/templates/common/base.html

webui/tickets/static/tickets/webui.js

webui/tickets/static/tickets/webuiforms.js

webui/tickets/templates/tickets/complete.html

webui/tickets/templates/tickets/create.html

webui/tickets/templates/tickets/failed.html

webui/tickets/templates/tickets/index.html

webui/tickets/templates/tickets/logview.html

webui/tickets/templates/tickets/ticket.html

webui/tickets/urls.py

webui/tickets/views.py

Show diffs side-by-side

added added

removed removed

bin/called-by-tarmac.py

ci-utils/ci_utils/__init__.py

ci-utils/ci_utils/ticket_states.py

ci-utils/setup.py

cli/ci_cli/__init__.py

cli/ci_cli/image.py

cli/ci_cli/tests/

cli/ci_cli/tests/__init__.py

cli/ci_cli/tests/test_cli.py

cli/ci_cli/tests/test_image.py

cli/ci_cli/tests/test_style.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

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/configs/webui_http_vhost

juju-deployer/test-runner.yaml.tmpl

nf-stats-service/nfss/scripts/

nf-stats-service/nfss/scripts/__init__.py

nf-stats-service/nfss/scripts/nfss_check.py

nf-stats-service/nfss/testing/

nf-stats-service/nfss/testing/__init__.py

nf-stats-service/nfss/testing/fake_server.py

nf-stats-service/nfss/testing/fixture_setup.py

nf-stats-service/nfss/tests/__init__.py

nf-stats-service/nfss/tests/scripts/

nf-stats-service/nfss/tests/scripts/__init__.py

nf-stats-service/nfss/tests/scripts/test_nfss_check.py

nf-stats-service/nfss/tests/unit/test_fixture_setup.py

nf-stats-service/setup.py

test_runner/bin/check_worker.py

test_runner/tstrun/run_worker.py

test_runner/tstrun/tests/__init__.py

test_runner/tstrun/tests/test_testbed.py

test_runner/tstrun/tests/test_worker.py

testing/run_tests.py

testing/venv.py

tests/deployers.py

tests/test_cli.py

tests/test_integration.py

tests/test_ticket_system.py

tests/test_webui.py

ticket_system/ticket/admin.py

ticket_system/ticket/api.py

ticket_system/ticket/migrations/0019_auto__add_field_review_status__chg_field_review_review_type.py

ticket_system/ticket/migrations/0020_fill_review_status.py

ticket_system/ticket/migrations/0021_auto__del_field_review_completed.py

ticket_system/ticket/models.py

ticket_system/ticket/tests/test_models.py

ticket_system/ticket/tests/test_read_api.py

ticket_system/ticket/tests/test_user_info.py

ticket_system/ticket/tests/test_write_api.py

ticket_system/ticket_system/urls.py

webui/common/static/common/edit.png

webui/common/static/common/merge-proposal-icon.png

webui/common/static/common/warning.png

webui/common/static/common/webui.css

webui/common/static/common/webui_login.js

webui/common/templates/common/base.html

webui/tickets/static/tickets/webui.js

webui/tickets/static/tickets/webui_pending_qa.js

webui/tickets/static/tickets/webui_ticket_edit.js

webui/tickets/static/tickets/webuiforms.js

webui/tickets/templates/tickets/complete.html

webui/tickets/templates/tickets/create.html

webui/tickets/templates/tickets/edit.html

webui/tickets/templates/tickets/failed.html

webui/tickets/templates/tickets/index.html

webui/tickets/templates/tickets/logview.html

webui/tickets/templates/tickets/pending_qa.html

webui/tickets/templates/tickets/ticket.html

webui/tickets/urls.py

webui/tickets/views.py

Older »