« back to all changes in this revision
Viewing changes to cupstream2distro/tests/data/branches/remergetrunk/bzr/repository/indices/a119ef58716fe2c655f9d1a220de380c.rix
- Committer: Vincent Ladeuil
- Date: 2014-07-17 16:18:14 UTC
- mfrom: (665.1.19 uci-engine)
- mto: (665.1.28 uci-engine)
- mto: This revision was merged to the branch mainline in revision 667.
- Revision ID: vila+ci@canonical.com-20140717161814-n3vov25liybhit3e
Merge trunk, resolving conflicts
- files added:
- bin/bakery.py
- charms/precise/chroot-builder
- charms/precise/chroot-builder/build
- charms/precise/chroot-builder/hooks
- charms/precise/chroot-builder/hooks/config-changed
- charms/precise/lander/unit_tests
- charms/precise/rabbitmq-worker/hooks/config-changed
- charms/precise/rabbitmq-worker/hooks/json_status-relation-joined
- charms/precise/rabbitmq-worker/hooks/local-monitors-relation-changed
- charms/precise/rabbitmq-worker/hooks/local-monitors-relation-joined
- charms/precise/rabbitmq-worker/hooks/nrpe-external-master-relation-changed
- charms/precise/rabbitmq-worker/hooks/nrpe-external-master-relation-joined
- charms/precise/rabbitmq-worker/unit_tests
- charms/precise/system-image-server
- charms/precise/system-image-server/build
- charms/precise/system-image-server/data
- charms/precise/system-image-server/hooks
- charms/precise/system-image-server/hooks/install
- charms/precise/system-image-server/hooks/upgrade-charm
- charms/precise/system-image-server/hooks/website-relation-changed
- charms/precise/system-image-server/hooks/website-relation-joined
- charms/precise/webui/hooks/json_status-relation-departed
- charms/precise/webui/hooks/proxy_logs-relation-departed
- charms/precise/webui/unit_tests
- charms/precise/wsgi-app/hooks/amqp-relation-changed
- charms/precise/wsgi-app/hooks/amqp-relation-departed
- charms/precise/wsgi-app/hooks/amqp-relation-joined
- charms/precise/wsgi-app/hooks/intercom-relation-broken
- charms/precise/wsgi-app/hooks/intercom-relation-changed
- charms/precise/wsgi-app/hooks/intercom-relation-joined
- charms/precise/wsgi-app/hooks/local-monitors-relation-changed
- charms/precise/wsgi-app/hooks/local-monitors-relation-joined
- charms/precise/wsgi-app/hooks/nrpe-external-master-relation-changed
- charms/precise/wsgi-app/hooks/nrpe-external-master-relation-joined
- charms/precise/wsgi-app/hooks/pgsql-relation-broken
- charms/precise/wsgi-app/hooks/pgsql-relation-changed
- charms/precise/wsgi-app/hooks/pgsql-relation-joined
- charms/precise/wsgi-app/unit_tests
- charms/trusty
- charms/trusty/wsgi-app
- cupstream2distro
- cupstream2distro/chroot-tools
- cupstream2distro/citrain
- cupstream2distro/citrain/cupstream2distro
- cupstream2distro/citrain/manual
- cupstream2distro/citrain/manual/jenkins-templates
- cupstream2distro/citrain/watch-ppa
- cupstream2distro/cupstream2distro
- cupstream2distro/manual
- cupstream2distro/tests
- cupstream2distro/tests/data
- cupstream2distro/tests/data/artefacts
- cupstream2distro/tests/data/branches
- cupstream2distro/tests/data/branches/basic
- cupstream2distro/tests/data/branches/basic/bzr
- cupstream2distro/tests/data/branches/basic/bzr/branch
- cupstream2distro/tests/data/branches/basic/bzr/branch-lock
- cupstream2distro/tests/data/branches/basic/bzr/branch/lock
- cupstream2distro/tests/data/branches/basic/bzr/checkout
- cupstream2distro/tests/data/branches/basic/bzr/checkout/lock
- cupstream2distro/tests/data/branches/basic/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/basic/bzr/repository
- cupstream2distro/tests/data/branches/basic/bzr/repository/indices
- cupstream2distro/tests/data/branches/basic/bzr/repository/lock
- cupstream2distro/tests/data/branches/basic/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/basic/bzr/repository/packs
- cupstream2distro/tests/data/branches/basic/bzr/repository/upload
- cupstream2distro/tests/data/branches/basic/debian
- cupstream2distro/tests/data/branches/basic/src
- cupstream2distro/tests/data/branches/basic_alone_symbols
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/branch
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/branch-lock
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/branch/lock
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/checkout
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/checkout/lock
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/repository
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/repository/indices
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/repository/lock
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/repository/packs
- cupstream2distro/tests/data/branches/basic_alone_symbols/bzr/repository/upload
- cupstream2distro/tests/data/branches/basic_alone_symbols/debian
- cupstream2distro/tests/data/branches/basic_alone_symbols/src
- cupstream2distro/tests/data/branches/basic_arch_symbols
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/branch
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/branch-lock
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/branch/lock
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/checkout
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/checkout/lock
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/repository
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/repository/indices
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/repository/lock
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/repository/packs
- cupstream2distro/tests/data/branches/basic_arch_symbols/bzr/repository/upload
- cupstream2distro/tests/data/branches/basic_arch_symbols/debian
- cupstream2distro/tests/data/branches/basic_arch_symbols/src
- cupstream2distro/tests/data/branches/basic_multiple_contents
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/branch
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/branch-lock
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/branch/lock
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/checkout
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/checkout/lock
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/repository
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/repository/indices
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/repository/lock
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/repository/packs
- cupstream2distro/tests/data/branches/basic_multiple_contents/bzr/repository/upload
- cupstream2distro/tests/data/branches/basic_multiple_contents/debian
- cupstream2distro/tests/data/branches/basic_multiple_contents/src
- cupstream2distro/tests/data/branches/basic_symbols
- cupstream2distro/tests/data/branches/basic_symbols/bzr
- cupstream2distro/tests/data/branches/basic_symbols/bzr/branch
- cupstream2distro/tests/data/branches/basic_symbols/bzr/branch-lock
- cupstream2distro/tests/data/branches/basic_symbols/bzr/branch/lock
- cupstream2distro/tests/data/branches/basic_symbols/bzr/checkout
- cupstream2distro/tests/data/branches/basic_symbols/bzr/checkout/lock
- cupstream2distro/tests/data/branches/basic_symbols/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/basic_symbols/bzr/repository
- cupstream2distro/tests/data/branches/basic_symbols/bzr/repository/indices
- cupstream2distro/tests/data/branches/basic_symbols/bzr/repository/lock
- cupstream2distro/tests/data/branches/basic_symbols/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/basic_symbols/bzr/repository/packs
- cupstream2distro/tests/data/branches/basic_symbols/bzr/repository/upload
- cupstream2distro/tests/data/branches/basic_symbols/debian
- cupstream2distro/tests/data/branches/basic_symbols/src
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/branch
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/branch-lock
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/branch/lock
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/checkout
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/checkout/lock
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/repository
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/repository/indices
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/repository/lock
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/repository/packs
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/bzr/repository/upload
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/debian
- cupstream2distro/tests/data/branches/basic_symbols_with_changelog/src
- cupstream2distro/tests/data/branches/changebetween_manual_uploads
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/branch
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/branch-lock
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/branch/lock
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/checkout
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/checkout/lock
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/repository
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/repository/indices
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/repository/lock
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/repository/packs
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/bzr/repository/upload
- cupstream2distro/tests/data/branches/changebetween_manual_uploads/debian
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/branch
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/branch-lock
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/branch/lock
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/checkout
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/checkout/dirstate
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/checkout/lock
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/repository
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/repository/format
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/repository/indices
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/repository/lock
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/repository/packs
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/bzr/repository/upload
- cupstream2distro/tests/data/branches/debianchangelog_change_on_onemanualupload/debian
- cupstream2distro/tests/data/branches/dummypackage
- cupstream2distro/tests/data/branches/dummypackage/.bzr-builddeb
- cupstream2distro/tests/data/branches/dummypackage/bzr
- cupstream2distro/tests/data/branches/dummypackage/bzr/branch
- cupstream2distro/tests/data/branches/dummypackage/bzr/branch-lock
- cupstream2distro/tests/data/branches/dummypackage/bzr/branch/lock
- cupstream2distro/tests/data/branches/dummypackage/bzr/checkout
- cupstream2distro/tests/data/branches/dummypackage/bzr/checkout/lock
- cupstream2distro/tests/data/branches/dummypackage/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/dummypackage/bzr/repository
- cupstream2distro/tests/data/branches/dummypackage/bzr/repository/indices
- cupstream2distro/tests/data/branches/dummypackage/bzr/repository/lock
- cupstream2distro/tests/data/branches/dummypackage/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/dummypackage/bzr/repository/packs
- cupstream2distro/tests/data/branches/dummypackage/bzr/repository/upload
- cupstream2distro/tests/data/branches/dummypackage/debian
- cupstream2distro/tests/data/branches/dummypackage/debian/source
- cupstream2distro/tests/data/branches/dummypackageprecise
- cupstream2distro/tests/data/branches/dummypackageprecise/.bzr-builddeb
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/branch
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/branch-lock
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/branch/lock
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/checkout
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/checkout/lock
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/repository
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/repository/indices
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/repository/lock
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/repository/packs
- cupstream2distro/tests/data/branches/dummypackageprecise/bzr/repository/upload
- cupstream2distro/tests/data/branches/dummypackageprecise/debian
- cupstream2distro/tests/data/branches/dummypackageprecise/debian/source
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/branch
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/branch-lock
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/branch/lock
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/checkout
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/checkout/lock
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/repository
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/repository/indices
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/repository/lock
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/repository/packs
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/bzr/repository/upload
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/debian
- cupstream2distro/tests/data/branches/multiple_symbols_with_changelog/src
- cupstream2distro/tests/data/branches/no_symbols_to_update
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/branch
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/branch-lock
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/branch/lock
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/checkout
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/checkout/lock
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/repository
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/repository/indices
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/repository/lock
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/repository/packs
- cupstream2distro/tests/data/branches/no_symbols_to_update/bzr/repository/upload
- cupstream2distro/tests/data/branches/no_symbols_to_update/debian
- cupstream2distro/tests/data/branches/no_symbols_to_update/src
- cupstream2distro/tests/data/branches/onemanualupload
- cupstream2distro/tests/data/branches/onemanualupload/bzr
- cupstream2distro/tests/data/branches/onemanualupload/bzr/branch
- cupstream2distro/tests/data/branches/onemanualupload/bzr/branch-lock
- cupstream2distro/tests/data/branches/onemanualupload/bzr/branch/lock
- cupstream2distro/tests/data/branches/onemanualupload/bzr/checkout
- cupstream2distro/tests/data/branches/onemanualupload/bzr/checkout/lock
- cupstream2distro/tests/data/branches/onemanualupload/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/onemanualupload/bzr/repository
- cupstream2distro/tests/data/branches/onemanualupload/bzr/repository/indices
- cupstream2distro/tests/data/branches/onemanualupload/bzr/repository/lock
- cupstream2distro/tests/data/branches/onemanualupload/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/onemanualupload/bzr/repository/packs
- cupstream2distro/tests/data/branches/onemanualupload/bzr/repository/upload
- cupstream2distro/tests/data/branches/onemanualupload/debian
- cupstream2distro/tests/data/branches/onenested
- cupstream2distro/tests/data/branches/onenested/bzr
- cupstream2distro/tests/data/branches/onenested/bzr/branch
- cupstream2distro/tests/data/branches/onenested/bzr/branch-lock
- cupstream2distro/tests/data/branches/onenested/bzr/branch/lock
- cupstream2distro/tests/data/branches/onenested/bzr/checkout
- cupstream2distro/tests/data/branches/onenested/bzr/checkout/lock
- cupstream2distro/tests/data/branches/onenested/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/onenested/bzr/repository
- cupstream2distro/tests/data/branches/onenested/bzr/repository/indices
- cupstream2distro/tests/data/branches/onenested/bzr/repository/lock
- cupstream2distro/tests/data/branches/onenested/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/onenested/bzr/repository/packs
- cupstream2distro/tests/data/branches/onenested/bzr/repository/upload
- cupstream2distro/tests/data/branches/onenested/debian
- cupstream2distro/tests/data/branches/onenested/src
- cupstream2distro/tests/data/branches/oneupstreamchange
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/branch
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/branch-lock
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/branch/lock
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/checkout
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/checkout/lock
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/repository
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/repository/indices
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/repository/lock
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/repository/packs
- cupstream2distro/tests/data/branches/oneupstreamchange/bzr/repository/upload
- cupstream2distro/tests/data/branches/oneupstreamchange/debian
- cupstream2distro/tests/data/branches/oneupstreamchange/src
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/branch
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/branch-lock
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/branch/lock
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/checkout
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/checkout/format
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/checkout/lock
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/repository
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/repository/indices
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/repository/lock
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/repository/packs
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/bzr/repository/upload
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/debian
- cupstream2distro/tests/data/branches/oneupstreamchange_before_snapshot_committed/src
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/branch
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/branch-lock
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/branch/lock
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/checkout
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/checkout/lock
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/repository
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/repository/indices
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/repository/lock
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/repository/packs
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/bzr/repository/upload
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/configure.ac
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/debian
- cupstream2distro/tests/data/branches/oneupstreamchange_with_unreleased_changelog_change/src
- cupstream2distro/tests/data/branches/onlyignorechanges
- cupstream2distro/tests/data/branches/onlyignorechanges/.pc
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/branch
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/branch-lock
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/branch/lock
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/checkout
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/checkout/lock
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/repository
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/repository/indices
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/repository/lock
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/repository/packs
- cupstream2distro/tests/data/branches/onlyignorechanges/bzr/repository/upload
- cupstream2distro/tests/data/branches/onlyignorechanges/debian
- cupstream2distro/tests/data/branches/onlyignorechanges/debian/source
- cupstream2distro/tests/data/branches/onlymanualuploads
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/branch
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/branch-lock
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/branch/lock
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/checkout
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/checkout/lock
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/repository
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/repository/indices
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/repository/lock
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/repository/packs
- cupstream2distro/tests/data/branches/onlymanualuploads/bzr/repository/upload
- cupstream2distro/tests/data/branches/onlymanualuploads/debian
- cupstream2distro/tests/data/branches/released_latestsnapshot_included
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/branch
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/branch-lock
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/branch/lock
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/checkout
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/checkout/lock
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/repository
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/repository/indices
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/repository/lock
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/repository/packs
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/bzr/repository/upload
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/debian
- cupstream2distro/tests/data/branches/released_latestsnapshot_included/src
- cupstream2distro/tests/data/branches/remergetrunk
- cupstream2distro/tests/data/branches/remergetrunk/bzr
- cupstream2distro/tests/data/branches/remergetrunk/bzr/branch
- cupstream2distro/tests/data/branches/remergetrunk/bzr/branch-lock
- cupstream2distro/tests/data/branches/remergetrunk/bzr/branch/lock
- cupstream2distro/tests/data/branches/remergetrunk/bzr/checkout
- cupstream2distro/tests/data/branches/remergetrunk/bzr/checkout/lock
- cupstream2distro/tests/data/branches/remergetrunk/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/remergetrunk/bzr/repository
- cupstream2distro/tests/data/branches/remergetrunk/bzr/repository/indices
- cupstream2distro/tests/data/branches/remergetrunk/bzr/repository/lock
- cupstream2distro/tests/data/branches/remergetrunk/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/remergetrunk/bzr/repository/packs
- cupstream2distro/tests/data/branches/remergetrunk/bzr/repository/upload
- cupstream2distro/tests/data/branches/remergetrunk/debian
- cupstream2distro/tests/data/branches/remergetrunk/src
- cupstream2distro/tests/data/branches/simple
- cupstream2distro/tests/data/branches/simple/bzr
- cupstream2distro/tests/data/branches/simple/bzr/branch
- cupstream2distro/tests/data/branches/simple/bzr/branch-lock
- cupstream2distro/tests/data/branches/simple/bzr/branch/lock
- cupstream2distro/tests/data/branches/simple/bzr/checkout
- cupstream2distro/tests/data/branches/simple/bzr/checkout/lock
- cupstream2distro/tests/data/branches/simple/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/simple/bzr/repository
- cupstream2distro/tests/data/branches/simple/bzr/repository/indices
- cupstream2distro/tests/data/branches/simple/bzr/repository/lock
- cupstream2distro/tests/data/branches/simple/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/simple/bzr/repository/packs
- cupstream2distro/tests/data/branches/simple/bzr/repository/upload
- cupstream2distro/tests/data/branches/simple/debian
- cupstream2distro/tests/data/branches/simple/src
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/branch
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/branch-lock
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/branch/lock
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/checkout
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/checkout/lock
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/repository
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/repository/indices
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/repository/lock
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/repository/packs
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/bzr/repository/upload
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/debian
- cupstream2distro/tests/data/branches/symbols_with_multiple_replace/src
- cupstream2distro/tests/data/branches/twosnapshotmarkers
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/branch
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/branch-lock
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/branch/lock
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/checkout
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/checkout/lock
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/repository
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/repository/indices
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/repository/lock
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/repository/packs
- cupstream2distro/tests/data/branches/twosnapshotmarkers/bzr/repository/upload
- cupstream2distro/tests/data/branches/twosnapshotmarkers/debian
- cupstream2distro/tests/data/branches/twosnapshotmarkers/src
- cupstream2distro/tests/data/branches/vcsbzrchange
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/branch
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/branch-lock
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/branch/lock
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/checkout
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/checkout/lock
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/repository
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/repository/indices
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/repository/lock
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/repository/packs
- cupstream2distro/tests/data/branches/vcsbzrchange/bzr/repository/upload
- cupstream2distro/tests/data/branches/vcsbzrchange/debian
- cupstream2distro/tests/data/branches/vcsbzrchange/src
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/branch
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/branch-lock
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/branch/lock
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/checkout
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/checkout/lock
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/repository
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/repository/indices
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/repository/lock
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/repository/packs
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/bzr/repository/upload
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/debian
- cupstream2distro/tests/data/branches/vcsbzrchangewithchangelog/src
- cupstream2distro/tests/data/branches/withversionsymbols
- cupstream2distro/tests/data/branches/withversionsymbols/bzr
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/branch
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/branch-lock
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/branch/lock
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/checkout
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/checkout/lock
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/checkout/shelf
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/repository
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/repository/indices
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/repository/lock
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/repository/obsolete_packs
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/repository/packs
- cupstream2distro/tests/data/branches/withversionsymbols/bzr/repository/upload
- cupstream2distro/tests/data/branches/withversionsymbols/debian
- cupstream2distro/tests/data/branches/withversionsymbols/src
- cupstream2distro/tests/data/bzrlogs
- cupstream2distro/tests/data/changelogs
- cupstream2distro/tests/data/project_files
- cupstream2distro/tests/data/results
- cupstream2distro/tests/data/results/bzr_log_nested
- cupstream2distro/tests/data/results/bzr_log_remerge_trunk
- cupstream2distro/tests/data/results/bzr_log_simple
- cupstream2distro/tests/data/results/foo_1.2-0ubuntu1_source.changes.lastcontent
- cupstream2distro/tests/data/results/foo_1.2-0ubuntu1_source.changes.onprecise
- cupstream2distro/tests/data/results/foo_1.2-0ubuntu1_source.changes.sincedistroversion
- cupstream2distro/tests/data/results/foo_package_foo_package_with_upstream_and_packaging_changes.diff
- cupstream2distro/tests/data/stack_configs
- cupstream2distro/tests/data/stack_configs/broken
- cupstream2distro/tests/data/stack_configs/broken/foo
- cupstream2distro/tests/data/stack_configs/default
- cupstream2distro/tests/data/stack_configs/default/back
- cupstream2distro/tests/data/stack_configs/default/front
- cupstream2distro/tests/data/stack_configs/default/head
- cupstream2distro/tests/data/stack_configs/simple
- cupstream2distro/tests/data/stack_configs/simple/foo
- cupstream2distro/tests/data/ubuntu_source_packages
- cupstream2distro/tests/data/ubuntu_source_packages/2manualuploads
- cupstream2distro/tests/data/ubuntu_source_packages/2manualuploads/debian
- cupstream2distro/tests/data/ubuntu_source_packages/foo_debian_package
- cupstream2distro/tests/data/ubuntu_source_packages/foo_native_package
- cupstream2distro/tests/data/ubuntu_source_packages/foo_native_package/foo_42.0daily83.09.13.2.tar.gz
- cupstream2distro/tests/data/ubuntu_source_packages/foo_native_ubuntu_version
- cupstream2distro/tests/data/ubuntu_source_packages/foo_package
- cupstream2distro/tests/data/ubuntu_source_packages/foo_package_with_new_binary_package
- cupstream2distro/tests/data/ubuntu_source_packages/foo_package_with_upstream_and_packaging_changes
- cupstream2distro/tests/data/ubuntu_source_packages/foo_package_with_upstream_changes
- cupstream2distro/tests/data/ubuntu_source_packages/foo_specialchars_package
- cupstream2distro/tests/data/ubuntu_source_packages/onemanualupload
- cupstream2distro/tests/data/ubuntu_source_packages/onemanualupload/debian
- cupstream2distro/tests/data/ubuntu_source_packages/onerelease
- cupstream2distro/tests/data/ubuntu_source_packages/onerelease/debian
- cupstream2distro/tests/data/ubuntu_source_packages/onerelease/src
- cupstream2distro/tests/data/ubuntu_source_packages/oneupstreamchange_before_snapshot_committed
- cupstream2distro/tests/data/ubuntu_source_packages/oneupstreamchange_before_snapshot_committed/debian
- cupstream2distro/tests/data/ubuntu_source_packages/oneupstreamchange_before_snapshot_committed/src
- cupstream2distro/tests/data/ubuntu_source_packages/regular_released_branch
- cupstream2distro/tests/data/ubuntu_source_packages/regular_released_branch/debian
- cupstream2distro/tests/data/ubuntu_source_packages/regular_released_branch/src
- cupstream2distro/tests/data/ubuntu_source_packages/ubuntu_foo_package_with_one_less_release
- cupstream2distro/tests/data/ubuntu_source_packages/ubuntu_foo_package_with_one_less_release/debian
- cupstream2distro/tests/data/ubuntu_source_packages/ubuntu_foo_package_with_one_less_release/setup.py
- cupstream2distro/tests/data/ubuntu_source_packages/ubuntu_foo_package_with_one_less_release/src
- cupstream2distro/tests/data/ubuntu_source_packages/ubuntu_foo_package_with_two_less_releases
- cupstream2distro/tests/data/ubuntu_source_packages/ubuntu_foo_package_with_two_less_releases/debian
- cupstream2distro/tests/data/ubuntu_source_packages/ubuntu_foo_package_with_two_less_releases/src
- cupstream2distro/tests/data/workdir
- cupstream2distro/tests/data/workdir/default
- cupstream2distro/tests/data/workdir/default/back
- cupstream2distro/tests/data/workdir/default/back/stack4
- cupstream2distro/tests/data/workdir/default/head
- cupstream2distro/tests/data/workdir/default/head/stack1
- cupstream2distro/tests/data/workdir/default/head/stack2
- cupstream2distro/tests/data/workdir/default/head/stack3
- cupstream2distro/tests/mocks
- cupstream2distro/tests/mocks/offline
- cupstream2distro/tests/mocks/offline/data
- cupstream2distro/tests/mocks/online
- cupstream2distro/tests/mocks/online/data
- cupstream2distro/tests/system
- cupstream2distro/tests/tools
- cupstream2distro/tests/unit
- nf-stats-service
- nf-stats-service/db_patches
- nf-stats-service/nfss
- nf-stats-service/nfss/api
- nf-stats-service/nfss/tests
- nf-stats-service/nfss/tests/unit
- nf-stats-service/web_static
- nf-stats-service/web_static/graphs
- testing
- ticket_system/ticket/management
- webui/common
- webui/common/static
- webui/common/static/common
- webui/common/templates
- webui/common/templates/common
- webui/packages
- webui/packages/static
- webui/packages/static/packages
- webui/packages/templates
- webui/packages/templates/packages
- webui/status
- webui/status/static
- webui/status/static/status
- webui/status/templates
- webui/status/templates/status
- webui/tickets
- webui/tickets/static
- webui/tickets/static/tickets
- webui/tickets/templates
- webui/tickets/templates/tickets
- webui/webui
- files removed:
- charms/precise/lander/hooks/install
- charms/precise/lander/hooks/upgrade-charm
- charms/precise/python-django
- charms/precise/python-django/hooks
- charms/precise/python-django/hooks/amqp-relation-broken
- charms/precise/python-django/hooks/amqp-relation-changed
- charms/precise/python-django/hooks/amqp-relation-joined
- charms/precise/python-django/hooks/cache-relation-broken
- charms/precise/python-django/hooks/cache-relation-changed
- charms/precise/python-django/hooks/cache-relation-joined
- charms/precise/python-django/hooks/config-changed
- charms/precise/python-django/hooks/django-settings-relation-broken
- charms/precise/python-django/hooks/django-settings-relation-changed
- charms/precise/python-django/hooks/django-settings-relation-joined
- charms/precise/python-django/hooks/install
- charms/precise/python-django/hooks/json_status-relation-joined
- charms/precise/python-django/hooks/mongodb-relation-broken
- charms/precise/python-django/hooks/mongodb-relation-changed
- charms/precise/python-django/hooks/mongodb-relation-joined
- charms/precise/python-django/hooks/pgsql-relation-broken
- charms/precise/python-django/hooks/pgsql-relation-changed
- charms/precise/python-django/hooks/pgsql-relation-joined
- charms/precise/python-django/hooks/start
- charms/precise/python-django/hooks/stop
- charms/precise/python-django/hooks/upgrade-charm
- charms/precise/python-django/hooks/website-relation-broken
- charms/precise/python-django/hooks/website-relation-changed
- charms/precise/python-django/hooks/website-relation-joined
- charms/precise/python-django/hooks/wsgi-relation-broken
- charms/precise/python-django/hooks/wsgi-relation-changed
- charms/precise/python-django/hooks/wsgi-relation-joined
- charms/precise/python-django/templates
- charms/precise/python-django/tests
- charms/precise/restish/hooks/start
- charms/precise/restish/hooks/stop
- charms/precise/restish/hooks/website-relation-broken
- charms/precise/webui/bin
- charms/precise/webui/hooks/amqp-relation-broken
- charms/precise/webui/hooks/amqp-relation-changed
- charms/precise/webui/hooks/json_status-relation-broken
- charms/precise/webui/hooks/proxy_logs-relation-broken
- charms/precise/webui/hooks/upgrade-charm
- image-builder/scripts
- webui/cgi
- files renamed:
- charms/precise/webui/bin/cm.py => charms/precise/webui/cm.py
- charms/precise/restish/ => charms/precise/wsgi-app/
- lander/bin/ppa_sync.py => publisher/publisher/ppa_sync.py
- test_runner/run_test.py => test_runner/tstrun/run_test.py
- run-tests => testing/run_tests.py
- webui/body_bg.jpg => webui/common/static/common/body_bg.jpg
- webui/cdrom.svg => webui/common/static/common/cdrom.svg
- webui/check.svg => webui/common/static/common/check.svg
- webui/cross.svg => webui/common/static/common/cross.svg
- webui/logo-ubuntu-orange.png => webui/common/static/common/logo-ubuntu-orange.png
- webui/spinner3.gif => webui/common/static/common/spinner3.gif
- webui/ubuntu-logo.png => webui/common/static/common/ubuntu-logo.png
- webui/ubuntu-styles.css => webui/common/static/common/ubuntu-styles.css
- webui/webui.css => webui/common/static/common/webui.css
- webui/packages.html => webui/packages/templates/packages/packages.html
- webui/status.html => webui/status/templates/status/index.html
- webui/cgi/queue_health.py => webui/status/views.py
- webui/webui.js => webui/tickets/static/tickets/webui.js
- webui/webui_complete.js => webui/tickets/static/tickets/webui_complete.js
- webui/webui_failed.js => webui/tickets/static/tickets/webui_failed.js
- webui/webui_logview.js => webui/tickets/static/tickets/webui_logview.js
- webui/webui_packages.js => webui/tickets/static/tickets/webui_packages.js
- webui/webui_status.js => webui/tickets/static/tickets/webui_status.js
- webui/webui_status_worker.js => webui/tickets/static/tickets/webui_status_worker.js
- webui/webui_ticket_detail.js => webui/tickets/static/tickets/webui_ticket_detail.js
- webui/webui_ticket_list.js => webui/tickets/static/tickets/webui_ticket_list.js
- webui/complete.html => webui/tickets/templates/tickets/complete.html
- webui/failed.html => webui/tickets/templates/tickets/failed.html
- webui/index.html => webui/tickets/templates/tickets/index.html
- webui/logview.html => webui/tickets/templates/tickets/logview.html
- webui/test_webui.html => webui/tickets/templates/tickets/test_webui.html
- webui/ticket.html => webui/tickets/templates/tickets/ticket.html
- files modified:
- .bzrignore
added
removed
cupstream2distro/tests/data/branches/remergetrunk/bzr/repository/indices/a119ef58716fe2c655f9d1a220de380c.rix
