← Back to branch summary

~joetalbott/uci-engine/user_auth

~joetalbott/uci-engine/user_auth

Viewing all changes in revision 843.

Committer: Joe Talbott
Date: 2014-11-06 03:07:42 UTC
mfrom: (830.1.53 uci-engine)
Revision ID: joe.talbott@canonical.com-20141106030742-rzha1xs7aya7swzz

merge with trunk

* resolve conflicts

files added:
britney_proxy/bin/uci-britney-report

britney_proxy/britney/config.py

britney_proxy/britney/process_reports.py

britney_proxy/britney/tests/test_config.py

britney_proxy/britney/tests/test_process_reports.py

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

ticket_system/ticket/migrations/0015_subticket_with_multiple_spus_and_mps_base.py

ticket_system/ticket/migrations/0016_subticket_with_multiple_spus_and_mps_data.py

ticket_system/ticket/migrations/0017_subticket_with_multiple_spus_and_mps_finish.py

ticket_system/ticket/migrations/0018_subticket_with_multiple_spus_and_mps_uniqueness.py

webui/common/static/common/edit.png

webui/common/static/common/pencil-black.png

files removed:
ci-utils/ci_utils/nova_client

ci-utils/ci_utils/nova_client/__init__.py

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/webui-collectstatic.py

branch-source-builder/bin/check_bsbuilder.py

branch-source-builder/bsbuilder/run_worker.py

branch-source-builder/bsbuilder/tests/test_upload.py

branch-source-builder/bsbuilder/upload_package.py

branch-source-builder/watch_ppa.py

britney_proxy/README.images

britney_proxy/bin/uci-britney-request

britney_proxy/britney/post_request.py

britney_proxy/britney/process_requests.py

britney_proxy/britney/process_results.py

britney_proxy/britney/tests/test_post_request.py

britney_proxy/britney/tests/test_process_results.py

ci-utils/ci_utils/__init__.py

ci-utils/ci_utils/amqp_utils.py

ci-utils/ci_utils/amqp_worker.py

ci-utils/ci_utils/testing/fixtures.py

ci-utils/ci_utils/tests/test_deployer.py

ci-utils/ci_utils/tests/test_fixtures.py

ci-utils/ci_utils/ticket_states.py

coverage-retriever/coverageretriever/run_worker.py

coverage-retriever/coverageretriever/tests/__init__.py

debian/control

debian/rules

docs/using-lxc-for-local-development.rst

image-builder/imagebuilder/cloud_image.py

image-builder/imagebuilder/run_worker.py

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/configs/webui_http_vhost

juju-deployer/coverage-retriever.yaml.tmpl

juju-deployer/test-runner.yaml.tmpl

lander/bin/lander_service_wrapper.py

lander/lander/run_worker.py

lander/lander/tests/test_service_wrapper.py

lander/lander/workflow.py

ppa-creator/ppacreator/run_worker.py

publisher/publisher/__init__.py

publisher/publisher/run_worker.py

publisher/publisher/tests/test_publisher.py

test_runner/bin/check_worker.py

test_runner/run-integration.py

test_runner/tstrun/run_test.py

test_runner/tstrun/run_worker.py

test_runner/tstrun/testbed.py

test_runner/tstrun/tests/__init__.py

test_runner/tstrun/tests/test_run_test.py

test_runner/tstrun/tests/test_testbed.py

test_runner/tstrun/tests/test_worker.py

testing/run_tests.py

tests/test_britney.py

tests/test_ppacreator.py

tests/test_rabbit.py

tests/test_style.py

tests/test_ticket_system.py

ticket_system/ticket/admin.py

ticket_system/ticket/api.py

ticket_system/ticket/models.py

ticket_system/ticket/tests/test_full_read_api.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

validator/validator/__init__.py

validator/validator/run_worker.py

validator/validator/tests/test_validator.py

webui/common/static/common/webui.css

webui/common/static/common/webui_login.js

webui/tickets/static/tickets/webui.js

webui/tickets/static/tickets/webuiforms.js

webui/tickets/urls.py

webui/tickets/views.py

Show diffs side-by-side

added added

removed removed

bin/webui-collectstatic.py

branch-source-builder/bin/check_bsbuilder.py

branch-source-builder/bsbuilder/run_worker.py

branch-source-builder/bsbuilder/tests/test_upload.py

branch-source-builder/bsbuilder/upload_package.py

branch-source-builder/watch_ppa.py

britney_proxy/README.images

britney_proxy/bin/uci-britney-report

britney_proxy/bin/uci-britney-request

britney_proxy/britney/config.py

britney_proxy/britney/post_request.py

britney_proxy/britney/process_reports.py

britney_proxy/britney/process_requests.py

britney_proxy/britney/process_results.py

britney_proxy/britney/tests/test_config.py

britney_proxy/britney/tests/test_post_request.py

britney_proxy/britney/tests/test_process_reports.py

britney_proxy/britney/tests/test_process_results.py

ci-utils/ci_utils/__init__.py

ci-utils/ci_utils/amqp_utils.py

ci-utils/ci_utils/amqp_worker.py

ci-utils/ci_utils/nova_client/

ci-utils/ci_utils/nova_client/__init__.py

ci-utils/ci_utils/testing/fixtures.py

ci-utils/ci_utils/tests/test_deployer.py

ci-utils/ci_utils/tests/test_fixtures.py

ci-utils/ci_utils/ticket_states.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

coverage-retriever/coverageretriever/run_worker.py

coverage-retriever/coverageretriever/tests/__init__.py

docs/using-lxc-for-local-development.rst

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

image-builder/imagebuilder/cloud_image.py

image-builder/imagebuilder/run_worker.py

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/configs/webui_http_vhost

juju-deployer/coverage-retriever.yaml.tmpl

juju-deployer/test-runner.yaml.tmpl

lander/bin/lander_service_wrapper.py

lander/lander/run_worker.py

lander/lander/tests/test_service_wrapper.py

lander/lander/workflow.py

ppa-creator/ppacreator/run_worker.py

publisher/publisher/__init__.py

publisher/publisher/run_worker.py

publisher/publisher/tests/test_publisher.py

test_runner/bin/check_worker.py

test_runner/run-integration.py

test_runner/tstrun/run_test.py

test_runner/tstrun/run_worker.py

test_runner/tstrun/testbed.py

test_runner/tstrun/tests/__init__.py

test_runner/tstrun/tests/test_run_test.py

test_runner/tstrun/tests/test_testbed.py

test_runner/tstrun/tests/test_worker.py

testing/run_tests.py

tests/test_britney.py

tests/test_cli.py

tests/test_integration.py

tests/test_ppacreator.py

tests/test_rabbit.py

tests/test_style.py

tests/test_ticket_system.py

ticket_system/ticket/admin.py

ticket_system/ticket/api.py

ticket_system/ticket/migrations/0015_subticket_with_multiple_spus_and_mps_base.py

ticket_system/ticket/migrations/0016_subticket_with_multiple_spus_and_mps_data.py

ticket_system/ticket/migrations/0017_subticket_with_multiple_spus_and_mps_finish.py

ticket_system/ticket/migrations/0018_subticket_with_multiple_spus_and_mps_uniqueness.py

ticket_system/ticket/models.py

ticket_system/ticket/tests/test_full_read_api.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

validator/validator/__init__.py

validator/validator/run_worker.py

validator/validator/tests/test_validator.py

webui/common/static/common/edit.png

webui/common/static/common/pencil-black.png

webui/common/static/common/webui.css

webui/common/static/common/webui_login.js

webui/tickets/static/tickets/webui.js

webui/tickets/static/tickets/webui_ticket_edit.js

webui/tickets/static/tickets/webuiforms.js

webui/tickets/templates/tickets/edit.html

webui/tickets/urls.py

webui/tickets/views.py

Older »