← Back to branch summary

~psivaa/uci-engine/lander-jenkins-with-proxy

~psivaa/uci-engine/lander-jenkins-with-proxy

« back to all changes in this revision

Viewing changes to docs/conf.py

Committer: Evan Dandrea
Date: 2014-03-14 10:37:28 UTC
mfrom: (387 ubuntu-ci-services-itself)
mto: This revision was merged to the branch mainline in revision 389.
Revision ID: evan.dandrea@canonical.com-20140314103728-i9wqk4r17gsya24h

Merge with trunk.

files added:
branch-source-builder/bsbuilder/tests/test_upload.py

ci-utils/ci_utils/amqp_worker.py

ci-utils/ci_utils/tests/test_amqp_worker.py

webui/check.svg

webui/cross.svg

webui/packages.html

webui/spinner3.gif

webui/webui_packages.js

files renamed:
branch-source-builder/upload_package.py => branch-source-builder/bsbuilder/upload_package.py

files modified:
TRICKS

branch-source-builder/bsbuilder/resources/v1.py

branch-source-builder/bsbuilder/run_worker.py

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

branch-source-builder/cupstream2distro/packageinppamanager.py

branch-source-builder/cupstream2distro/settings.py

branch-source-builder/setup.py

branch-source-builder/watch_ppa.py

cli/ci_libs/status.py

cli/tests/test_cli.py

cli/tests/test_get_ticket_status.py

create_lp_creds.py

debian/control

docs/components/branch-source-builder.rst

docs/components/image-builder.rst

docs/conf.py

docs/usage.rst

image-builder/imagebuilder/cloud_image.py

image-builder/imagebuilder/resources/v1.py

image-builder/imagebuilder/run_worker.py

image-builder/imagebuilder/tests/test_api_v1.py

image-builder/imagebuilder/tests/test_modify_cloud_image.py

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

juju-deployer/configs/unit_config.yaml.tmpl

juju-deployer/deploy.py

juju-deployer/image-builder.yaml.tmpl

juju-deployer/lander.yaml.tmpl

juju-deployer/test_deploy.py

lander/bin/lander_service_wrapper.py

lander/bin/ticket_api.py

lander/lander/run_worker.py

lander/lander/tests/test_service_wrapper.py

ppa-assigner/ppa_assigner/api.py

ppa-assigner/ppa_assigner/launchpad.py

ppa-assigner/ppa_assigner/management/__init__.py

ppa-assigner/ppa_assigner/migrations/0001_initial.py

ppa-assigner/ppa_assigner/models.py

ppa-assigner/ppa_assigner/ppa_sync.py

ppa-assigner/ppa_assigner/settings.py

ppa-assigner/ppa_assigner/tests.py

run-tests

test_runner/run_test.py

test_runner/tstrun/resources/v1.py

test_runner/tstrun/run_worker.py

test_runner/tstrun/testbed.py

test_runner/tstrun/tests/test_run_test.py

test_runner/tstrun/tests/test_v1.py

tests/ppa_assigner/test.py

tests/test_runner/test.py

ticket_system/ticket/api.py

ticket_system/ticket/tests/test_write_api.py

webui/index.html

webui/status.html

webui/test_webui.html

webui/webui.css

webui/webui.js

Show diffs side-by-side

added added

removed removed

41

41

42

42

# General information about the project.

43

43

project = u'Ubuntu CI Engine'

44

copyright = u'2013, Canonical Ltd.'

44

copyright = u'2013-2014, Canonical Ltd.'

45

45

46

46

# The version info for the project you're documenting, acts as replacement for

47

47

# |version| and |release|, also used in various other places throughout the

Older »