← Back to branch summary

~vila/uci-engine/enable-nova-and-swift

~vila/uci-engine/enable-nova-and-swift

Viewing all changes in revision 616.3.9.

Committer: Evan Dandrea
Date: 2014-06-30 12:07:54 UTC
mfrom: (630 uci-engine)
mto: This revision was merged to the branch mainline in revision 655.
Revision ID: evan.dandrea@canonical.com-20140630120754-z6x5eqdahpp2qfrt

Merge with trunk.

files added:
charms/precise/lander/unit_tests

charms/precise/lander/unit_tests/__init__.py

charms/precise/lander/unit_tests/test_hooks.py

charms/precise/python-django/templates/logging.tmpl

charms/precise/webui/hooks/json_status-relation-departed

charms/precise/webui/hooks/proxy_logs-relation-departed

charms/precise/webui/unit_tests

charms/precise/webui/unit_tests/__init__.py

charms/precise/webui/unit_tests/test_hooks.py

image-builder/imagebuilder/tests/test_worker.py

files removed:
charms/precise/webui/hooks/json_status-relation-broken

charms/precise/webui/hooks/proxy_logs-relation-broken

files modified:
bin/create_lp_creds.py

charms/precise/chroot-builder/hooks/hooks.py

charms/precise/lander/Makefile

charms/precise/lander/hooks/hooks.py

charms/precise/python-django/config.yaml

charms/precise/python-django/hooks/hooks.py

charms/precise/restish/config.yaml

charms/precise/restish/hooks/hooks.py

charms/precise/restish/unit_tests/test_hooks.py

charms/precise/webui/Makefile

charms/precise/webui/hooks/hooks.py

ci-utils/ci_utils/amqp_worker.py

gatekeeper/bin/gatekeeper

gatekeeper/gatekeeper/datastore/sandbox.py

gatekeeper/gatekeeper/datastore/tests/test_sandbox.py

gatekeeper/gatekeeper/resources/tests/test_api.py

gatekeeper/gatekeeper/resources/tests/test_datastore_factories.py

gatekeeper/gatekeeper/resources/v1.py

gatekeeper/gatekeeper/wsgi.py

image-builder/imagebuilder/cloud_image.py

image-builder/imagebuilder/run_worker.py

juju-deployer/branch-source-builder.yaml.tmpl

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/deploy.py

juju-deployer/test_deploy.py

juju-deployer/webui.yaml.tmpl

lander/bin/json_status_cgi.py

lander/lander/run_worker.py

lander/lander/tests/test_run_worker.py

lander/lander/ticket_api.py

ppa-assigner/ppa_assigner/settings.py

testing/run_tests.py

ticket_system/ticket/api.py

ticket_system/ticket/migrations/0002_uce0.py

ticket_system/ticket/models.py

ticket_system/ticket/tests/test_full_read_api.py

ticket_system/ticket/tests/test_read_api.py

ticket_system/ticket/tests/test_write_api.py

ticket_system/ticket_system/settings.py

webui/tickets/static/tickets/webui.js

webui/tickets/static/tickets/webui_complete.js

webui/tickets/static/tickets/webui_failed.js

webui/tickets/static/tickets/webui_ticket_detail.js

webui/tickets/static/tickets/webui_ticket_list.js

webui/tickets/templates/tickets/logview.html

webui/tickets/views.py

webui/webui/settings.py

Show diffs side-by-side

added added

removed removed

bin/create_lp_creds.py

charms/precise/chroot-builder/hooks/hooks.py

charms/precise/lander/Makefile

charms/precise/lander/hooks/hooks.py

charms/precise/lander/unit_tests/

charms/precise/lander/unit_tests/__init__.py

charms/precise/lander/unit_tests/test_hooks.py

charms/precise/python-django/config.yaml

charms/precise/python-django/hooks/hooks.py

charms/precise/python-django/templates/logging.tmpl

charms/precise/restish/config.yaml

charms/precise/restish/hooks/hooks.py

charms/precise/restish/unit_tests/test_hooks.py

charms/precise/webui/Makefile

charms/precise/webui/hooks/hooks.py

charms/precise/webui/hooks/json_status-relation-broken@

charms/precise/webui/hooks/json_status-relation-departed@

charms/precise/webui/hooks/proxy_logs-relation-broken@

charms/precise/webui/hooks/proxy_logs-relation-departed@

charms/precise/webui/unit_tests/

charms/precise/webui/unit_tests/__init__.py

charms/precise/webui/unit_tests/test_hooks.py

ci-utils/ci_utils/amqp_worker.py

gatekeeper/bin/gatekeeper

gatekeeper/gatekeeper/datastore/sandbox.py

gatekeeper/gatekeeper/datastore/tests/test_sandbox.py

gatekeeper/gatekeeper/resources/tests/test_api.py

gatekeeper/gatekeeper/resources/tests/test_datastore_factories.py

gatekeeper/gatekeeper/resources/v1.py

gatekeeper/gatekeeper/wsgi.py

image-builder/imagebuilder/cloud_image.py

image-builder/imagebuilder/run_worker.py

image-builder/imagebuilder/tests/test_worker.py

juju-deployer/branch-source-builder.yaml.tmpl

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/deploy.py

juju-deployer/test_deploy.py

juju-deployer/webui.yaml.tmpl

lander/bin/json_status_cgi.py

lander/lander/run_worker.py

lander/lander/tests/test_run_worker.py

lander/lander/ticket_api.py

ppa-assigner/ppa_assigner/settings.py

testing/run_tests.py

ticket_system/ticket/api.py

ticket_system/ticket/migrations/0002_uce0.py

ticket_system/ticket/models.py

ticket_system/ticket/tests/test_full_read_api.py

ticket_system/ticket/tests/test_read_api.py

ticket_system/ticket/tests/test_write_api.py

ticket_system/ticket_system/settings.py

webui/tickets/static/tickets/webui.js

webui/tickets/static/tickets/webui_complete.js

webui/tickets/static/tickets/webui_failed.js

webui/tickets/static/tickets/webui_ticket_detail.js

webui/tickets/static/tickets/webui_ticket_list.js

webui/tickets/templates/tickets/logview.html

webui/tickets/views.py

webui/webui/settings.py

Older »