← Back to branch summary

~deryck/launchpad/do-not-snapshot-collections

~deryck/launchpad/do-not-snapshot-collections

Viewing all changes in revision 13163.

Committer: William Grant
Date: 2011-06-06 11:09:09 UTC
mfrom: (7675.1045.464 db-devel)
Revision ID: william.grant@canonical.com-20110606110909-57xmbxl6jxn4ydme

Merge db-stable r10647, resolving conflicts.

files added:
database/schema/patch-2208-60-1.sql

database/schema/patch-2208-62-0.sql

database/schema/patch-2208-63-0.sql

database/schema/patch-2208-64-0.sql

database/schema/patch-2208-65-1.sql

database/schema/patch-2208-65-2.sql

database/schema/patch-2208-67-0.sql

database/schema/patch-2208-68-0.sql

database/schema/patch-2208-69-0.sql

database/schema/patch-2208-70-0.sql

database/schema/patch-2208-71-0.sql

database/schema/patch-2208-72-0.sql

database/schema/patch-2208-73-0.sql

lib/canonical/launchpad/images/mute.png

lib/canonical/launchpad/images/unmute.png

lib/lp/bugs/doc/bugsummary.txt

lib/lp/bugs/interfaces/bugsummary.py

lib/lp/bugs/model/bugsummary.py

lib/lp/bugs/model/tests/test_bugsummary.py

lib/lp/bugs/templates/bug-portlet-subscription.pt

lib/lp/registry/browser/tests/test_distroseries_webservice.py

lib/lp/soyuz/interfaces/copypolicy.py

lib/lp/soyuz/interfaces/packagecopyjob.py

files renamed:
lib/lp/registry/tests/test_derivedistroseries.py => lib/lp/registry/tests/test_initderiveddistroseries.py

files modified:
configs/development/launchpad-lazr.conf

database/sampledata/current-dev.sql

database/sampledata/current.sql

database/schema/comments.sql

database/schema/security.cfg

database/schema/trusted.sql

lib/canonical/config/schema-lazr.conf

lib/canonical/launchpad/icing/sprite.css.in

lib/canonical/launchpad/icing/style-3-0.css

lib/canonical/launchpad/icing/style.css

lib/canonical/launchpad/interfaces/_schema_circular_imports.py

lib/canonical/launchpad/security.py

lib/lp/answers/model/question.py

lib/lp/answers/model/questionmessage.py

lib/lp/answers/model/questionsperson.py

lib/lp/archiveuploader/tests/test_uploadprocessor.py

lib/lp/bugs/browser/bug.py

lib/lp/bugs/browser/bugsubscription.py

lib/lp/bugs/browser/bugsubscriptionfilter.py

lib/lp/bugs/browser/configure.zcml

lib/lp/bugs/browser/tests/test_bug_context_menu.py

lib/lp/bugs/browser/tests/test_bug_views.py

lib/lp/bugs/browser/tests/test_bugsubscription_views.py

lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py

lib/lp/bugs/configure.zcml

lib/lp/bugs/doc/bugnotification-sending.txt

lib/lp/bugs/emailtemplates/bug-notification-verbose.txt

lib/lp/bugs/emailtemplates/bug-notification.txt

lib/lp/bugs/enum.py

lib/lp/bugs/interfaces/bug.py

lib/lp/bugs/interfaces/bugnotification.py

lib/lp/bugs/javascript/bugtask_index_portlets.js

lib/lp/bugs/javascript/subscriber.js

lib/lp/bugs/javascript/subscription.js

lib/lp/bugs/javascript/tests/test_subscription.js

lib/lp/bugs/model/bug.py

lib/lp/bugs/model/bugnotification.py

lib/lp/bugs/model/bugsubscriptionfilter.py

lib/lp/bugs/model/personsubscriptioninfo.py

lib/lp/bugs/model/tests/test_bug.py

lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py

lib/lp/bugs/model/tests/test_personsubscriptioninfo.py

lib/lp/bugs/scripts/bugnotification.py

lib/lp/bugs/scripts/tests/test_bugnotification.py

lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt

lib/lp/bugs/stories/webservice/xx-bug.txt

lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt

lib/lp/bugs/templates/bug-portlet-subscribers-content.pt

lib/lp/bugs/templates/bug-portlet-subscribers.pt

lib/lp/bugs/templates/bugtask-index.pt

lib/lp/bugs/tests/test_bug.py

lib/lp/bugs/tests/test_bugchanges.py

lib/lp/bugs/tests/test_bugnotification.py

lib/lp/bugs/tests/test_structuralsubscription.py

lib/lp/registry/browser/configure.zcml

lib/lp/registry/browser/distroseries.py

lib/lp/registry/browser/distroseriesdifference.py

lib/lp/registry/browser/tests/test_distroseries.py

lib/lp/registry/browser/tests/test_distroseriesdifference_views.py

lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py

lib/lp/registry/configure.zcml

lib/lp/registry/doc/distroseries.txt

lib/lp/registry/errors.py

lib/lp/registry/interfaces/distribution.py

lib/lp/registry/interfaces/distroseries.py

lib/lp/registry/interfaces/distroseriesdifference.py

lib/lp/registry/interfaces/distroseriesparent.py

lib/lp/registry/javascript/distroseries.js

lib/lp/registry/javascript/distroseriesdifferences_details.js

lib/lp/registry/javascript/structural-subscription.js

lib/lp/registry/javascript/tests/test_distroseries.js

lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.html

lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.js

lib/lp/registry/javascript/tests/test_structural_subscription.js

lib/lp/registry/model/distroseries.py

lib/lp/registry/model/distroseriesdifference.py

lib/lp/registry/model/distroseriesparent.py

lib/lp/registry/model/person.py

lib/lp/registry/scripts/populate_distroseriesdiff.py

lib/lp/registry/scripts/tests/test_populate_distroseriesdiff.py

lib/lp/registry/stories/distribution/xx-distribution-overview.txt

lib/lp/registry/stories/distroseries/xx-distroseries-index.txt

lib/lp/registry/stories/webservice/xx-derivedistroseries.txt

lib/lp/registry/stories/webservice/xx-distroseries.txt

lib/lp/registry/templates/distribution-index.pt

lib/lp/registry/templates/distroseries-details.pt

lib/lp/registry/templates/distroseries-index.pt

lib/lp/registry/templates/distroseries-initialize.pt

lib/lp/registry/templates/distroseries-localdifferences.pt

lib/lp/registry/templates/distroseries-portlet-derivation.pt

lib/lp/registry/templates/distroseriesdifference-listing-extra.pt

lib/lp/registry/tests/test_distroseries.py

lib/lp/registry/tests/test_distroseries_vocabularies.py

lib/lp/registry/tests/test_distroseriesdifference.py

lib/lp/registry/tests/test_distroseriesparent.py

lib/lp/registry/vocabularies.py

lib/lp/registry/vocabularies.zcml

lib/lp/registry/windmill/tests/test_distroseriesdifference_expander.py

lib/lp/services/features/__init__.py

lib/lp/services/features/flags.py

lib/lp/soyuz/adapters/archivedependencies.py

lib/lp/soyuz/adapters/copypolicy.py

lib/lp/soyuz/adapters/overrides.py

lib/lp/soyuz/adapters/tests/test_copypolicy.py

lib/lp/soyuz/adapters/tests/test_overrides.py

lib/lp/soyuz/browser/archive.py

lib/lp/soyuz/browser/configure.zcml

lib/lp/soyuz/browser/sourcepackage.py

lib/lp/soyuz/browser/tests/test_package_copying_mixin.py

lib/lp/soyuz/configure.zcml

lib/lp/soyuz/doc/archive-dependencies.txt

lib/lp/soyuz/doc/distroseriesqueue.txt

lib/lp/soyuz/doc/soyuz-set-of-uploads.txt

lib/lp/soyuz/enums.py

lib/lp/soyuz/interfaces/distributionjob.py

lib/lp/soyuz/interfaces/packageset.py

lib/lp/soyuz/interfaces/publishing.py

lib/lp/soyuz/interfaces/queue.py

lib/lp/soyuz/model/archive.py

lib/lp/soyuz/model/binarypackagename.py

lib/lp/soyuz/model/distroseriesdifferencejob.py

lib/lp/soyuz/model/initialisedistroseriesjob.py

lib/lp/soyuz/model/packagecopyjob.py

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/model/queue.py

lib/lp/soyuz/scripts/initialise_distroseries.py

lib/lp/soyuz/scripts/packagecopier.py

lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py

lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt

lib/lp/soyuz/tests/test_archive.py

lib/lp/soyuz/tests/test_distroseriesdifferencejob.py

lib/lp/soyuz/tests/test_initialisedistroseriesjob.py

lib/lp/soyuz/tests/test_packagecopyjob.py

lib/lp/soyuz/tests/test_packageupload.py

lib/lp/soyuz/tests/test_publishing.py

lib/lp/testing/factory.py

scripts/ftpmaster-tools/initialise-from-parent.py

utilities/soyuz-sampledata-setup.py

Show diffs side-by-side

added added

removed removed

configs/development/launchpad-lazr.conf

database/sampledata/current-dev.sql

database/sampledata/current.sql

database/schema/comments.sql

database/schema/patch-2208-60-1.sql

database/schema/patch-2208-62-0.sql

database/schema/patch-2208-63-0.sql

database/schema/patch-2208-64-0.sql

database/schema/patch-2208-65-1.sql

database/schema/patch-2208-65-2.sql

database/schema/patch-2208-67-0.sql

database/schema/patch-2208-68-0.sql

database/schema/patch-2208-69-0.sql

database/schema/patch-2208-70-0.sql

database/schema/patch-2208-71-0.sql

database/schema/patch-2208-72-0.sql

database/schema/patch-2208-73-0.sql

database/schema/security.cfg

database/schema/trusted.sql

lib/canonical/config/schema-lazr.conf

lib/canonical/launchpad/icing/sprite.css.in

lib/canonical/launchpad/icing/style-3-0.css

lib/canonical/launchpad/icing/style.css

lib/canonical/launchpad/images/mute.png

lib/canonical/launchpad/images/unmute.png

lib/canonical/launchpad/interfaces/_schema_circular_imports.py

lib/canonical/launchpad/security.py

lib/lp/answers/model/question.py

lib/lp/answers/model/questionmessage.py

lib/lp/answers/model/questionsperson.py

lib/lp/archiveuploader/tests/test_uploadprocessor.py

lib/lp/bugs/browser/bug.py

lib/lp/bugs/browser/bugsubscription.py

lib/lp/bugs/browser/bugsubscriptionfilter.py

lib/lp/bugs/browser/configure.zcml

lib/lp/bugs/browser/tests/test_bug_context_menu.py

lib/lp/bugs/browser/tests/test_bug_views.py

lib/lp/bugs/browser/tests/test_bugsubscription_views.py

lib/lp/bugs/browser/tests/test_bugsubscriptionfilter.py

lib/lp/bugs/configure.zcml

lib/lp/bugs/doc/bugnotification-sending.txt

lib/lp/bugs/doc/bugsummary.txt

lib/lp/bugs/emailtemplates/bug-notification-verbose.txt

lib/lp/bugs/emailtemplates/bug-notification.txt

lib/lp/bugs/enum.py

lib/lp/bugs/interfaces/bug.py

lib/lp/bugs/interfaces/bugnotification.py

lib/lp/bugs/interfaces/bugsummary.py

lib/lp/bugs/javascript/bugtask_index_portlets.js

lib/lp/bugs/javascript/subscriber.js

lib/lp/bugs/javascript/subscription.js

lib/lp/bugs/javascript/tests/test_subscription.js

lib/lp/bugs/model/bug.py

lib/lp/bugs/model/bugnotification.py

lib/lp/bugs/model/bugsubscriptionfilter.py

lib/lp/bugs/model/bugsummary.py

lib/lp/bugs/model/personsubscriptioninfo.py

lib/lp/bugs/model/tests/test_bug.py

lib/lp/bugs/model/tests/test_bugsubscriptioninfo.py

lib/lp/bugs/model/tests/test_bugsummary.py

lib/lp/bugs/model/tests/test_personsubscriptioninfo.py

lib/lp/bugs/scripts/bugnotification.py

lib/lp/bugs/scripts/tests/test_bugnotification.py

lib/lp/bugs/stories/bugs/xx-bug-personal-subscriptions.txt

lib/lp/bugs/stories/webservice/xx-bug.txt

lib/lp/bugs/stories/xx-bugs-statistics-portlet.txt

lib/lp/bugs/templates/bug-portlet-subscribers-content.pt

lib/lp/bugs/templates/bug-portlet-subscribers.pt

lib/lp/bugs/templates/bug-portlet-subscription.pt

lib/lp/bugs/templates/bugtask-index.pt

lib/lp/bugs/tests/test_bug.py

lib/lp/bugs/tests/test_bugchanges.py

lib/lp/bugs/tests/test_bugnotification.py

lib/lp/bugs/tests/test_structuralsubscription.py

lib/lp/registry/browser/configure.zcml

lib/lp/registry/browser/distroseries.py

lib/lp/registry/browser/distroseriesdifference.py

lib/lp/registry/browser/tests/test_distroseries.py

lib/lp/registry/browser/tests/test_distroseries_webservice.py

lib/lp/registry/browser/tests/test_distroseriesdifference_views.py

lib/lp/registry/browser/tests/test_distroseriesdifference_webservice.py

lib/lp/registry/configure.zcml

lib/lp/registry/doc/distroseries.txt

lib/lp/registry/errors.py

lib/lp/registry/interfaces/distribution.py

lib/lp/registry/interfaces/distroseries.py

lib/lp/registry/interfaces/distroseriesdifference.py

lib/lp/registry/interfaces/distroseriesparent.py

lib/lp/registry/javascript/distroseries.js

lib/lp/registry/javascript/distroseriesdifferences_details.js

lib/lp/registry/javascript/structural-subscription.js

lib/lp/registry/javascript/tests/test_distroseries.js

lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.html

lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.js

lib/lp/registry/javascript/tests/test_structural_subscription.js

lib/lp/registry/model/distroseries.py

lib/lp/registry/model/distroseriesdifference.py

lib/lp/registry/model/distroseriesparent.py

lib/lp/registry/model/person.py

lib/lp/registry/scripts/populate_distroseriesdiff.py

lib/lp/registry/scripts/tests/test_populate_distroseriesdiff.py

lib/lp/registry/stories/distribution/xx-distribution-overview.txt

lib/lp/registry/stories/distroseries/xx-distroseries-index.txt

lib/lp/registry/stories/webservice/xx-derivedistroseries.txt

lib/lp/registry/stories/webservice/xx-distroseries.txt

lib/lp/registry/templates/distribution-index.pt

lib/lp/registry/templates/distroseries-details.pt

lib/lp/registry/templates/distroseries-index.pt

lib/lp/registry/templates/distroseries-initialize.pt

lib/lp/registry/templates/distroseries-localdifferences.pt

lib/lp/registry/templates/distroseries-portlet-derivation.pt

lib/lp/registry/templates/distroseriesdifference-listing-extra.pt

lib/lp/registry/tests/test_distroseries.py

lib/lp/registry/tests/test_distroseries_vocabularies.py

lib/lp/registry/tests/test_distroseriesdifference.py

lib/lp/registry/tests/test_distroseriesparent.py

lib/lp/registry/tests/test_initderiveddistroseries.py

lib/lp/registry/vocabularies.py

lib/lp/registry/vocabularies.zcml

lib/lp/registry/windmill/tests/test_distroseriesdifference_expander.py

lib/lp/services/features/__init__.py

lib/lp/services/features/flags.py

lib/lp/soyuz/adapters/archivedependencies.py

lib/lp/soyuz/adapters/copypolicy.py

lib/lp/soyuz/adapters/overrides.py

lib/lp/soyuz/adapters/tests/test_copypolicy.py

lib/lp/soyuz/adapters/tests/test_overrides.py

lib/lp/soyuz/browser/archive.py

lib/lp/soyuz/browser/configure.zcml

lib/lp/soyuz/browser/sourcepackage.py

lib/lp/soyuz/browser/tests/test_package_copying_mixin.py

lib/lp/soyuz/configure.zcml

lib/lp/soyuz/doc/archive-dependencies.txt

lib/lp/soyuz/doc/distroseriesqueue.txt

lib/lp/soyuz/doc/soyuz-set-of-uploads.txt

lib/lp/soyuz/enums.py

lib/lp/soyuz/interfaces/copypolicy.py

lib/lp/soyuz/interfaces/distributionjob.py

lib/lp/soyuz/interfaces/packagecopyjob.py

lib/lp/soyuz/interfaces/packageset.py

lib/lp/soyuz/interfaces/publishing.py

lib/lp/soyuz/interfaces/queue.py

lib/lp/soyuz/model/archive.py

lib/lp/soyuz/model/binarypackagename.py

lib/lp/soyuz/model/distroseriesdifferencejob.py

lib/lp/soyuz/model/initialisedistroseriesjob.py

lib/lp/soyuz/model/packagecopyjob.py

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/model/queue.py

lib/lp/soyuz/scripts/initialise_distroseries.py

lib/lp/soyuz/scripts/packagecopier.py

lib/lp/soyuz/scripts/tests/test_initialise_distroseries.py

lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt

lib/lp/soyuz/tests/test_archive.py

lib/lp/soyuz/tests/test_distroseriesdifferencejob.py

lib/lp/soyuz/tests/test_initialisedistroseriesjob.py

lib/lp/soyuz/tests/test_packagecopyjob.py

lib/lp/soyuz/tests/test_packageupload.py

lib/lp/soyuz/tests/test_publishing.py

lib/lp/testing/factory.py

scripts/ftpmaster-tools/initialise-from-parent.py

utilities/soyuz-sampledata-setup.py

Older »