← Back to branch summary

~henninge/launchpad/devel-merge-db-stable-9972

~henninge/launchpad/devel-merge-db-stable-9972

Viewing all changes in revision 11927.

Committer: Henning Eggers
Date: 2010-11-15 14:49:40 UTC
mfrom: (7675.785.324 launchpad)
Revision ID: henning@canonical.com-20101115144940-hvnloczqfbejwcn4

Merged db-stable r9972.

files added:
bzrplugins/difftacular

cronscripts/update-bugzilla-remote-components.py

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

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

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

lib/canonical/launchpad/scripts/bzremotecomponentfinder.py

lib/lp/bugs/tests/test_bzremotecomponentfinder.py

lib/lp/bugs/tests/testfiles/bugzilla-fdo-advanced-query.html

lib/lp/bugs/tests/testfiles/bugzilla-wine-advanced-query.html

lib/lp/code/browser/branchmergequeue.py

lib/lp/code/browser/tests/test_branchmergequeue.py

lib/lp/code/interfaces/branchmergequeue.py

lib/lp/code/model/branchmergequeue.py

lib/lp/code/model/tests/test_branchmergequeue.py

lib/lp/code/templates/branchmergequeue-index.pt

files removed:
lib/canonical/launchpad/database/tests/test_stormextensions.py

lib/lp/code/interfaces/branchmergequeue.py

lib/lp/code/model/branchmergequeue.py

lib/lp/code/model/tests/test_branchmergequeue.py

lib/lp/registry/exceptions.py

files modified:
bzrplugins/lpserve/__init__.py

bzrplugins/lpserve/test_lpserve.py

cronscripts/update-remote-product.py

database/sampledata/current-dev.sql

database/sampledata/current.sql

database/schema/comments.sql

database/schema/security.cfg

database/schema/security.py

database/schema/trusted.sql

lib/canonical/buildd/buildrecipe

lib/canonical/buildd/debian/changelog

lib/canonical/config/__init__.py

lib/canonical/config/schema-lazr.conf

lib/canonical/launchpad/database/account.py

lib/canonical/launchpad/database/stormsugar.py

lib/canonical/launchpad/doc/launchpadlib.txt

lib/canonical/launchpad/helpers.py

lib/canonical/launchpad/interfaces/_schema_circular_imports.py

lib/canonical/launchpad/scripts/updateremoteproduct.py

lib/canonical/launchpad/security.py

lib/canonical/launchpad/testing/browser.py

lib/canonical/launchpad/vocabularies/dbobjects.py

lib/canonical/launchpad/webapp/batching.py

lib/canonical/launchpad/webapp/configure.zcml

lib/canonical/launchpad/webapp/pgsession.py

lib/canonical/launchpad/webapp/tests/cookie-authentication.txt

lib/canonical/launchpad/webapp/tests/login.txt

lib/canonical/launchpad/webapp/tests/no-anonymous-session-cookies.txt

lib/canonical/launchpad/webapp/tests/test_login.py

lib/canonical/launchpad/webapp/vocabulary.py

lib/canonical/testing/__init__.py

lib/canonical/testing/layers.py

lib/lp/archivepublisher/ftparchive.py

lib/lp/bugs/browser/bugtracker.py

lib/lp/bugs/browser/configure.zcml

lib/lp/bugs/configure.zcml

lib/lp/bugs/doc/bugtask-find-similar.txt

lib/lp/bugs/interfaces/bug.py

lib/lp/bugs/interfaces/bugtracker.py

lib/lp/bugs/model/bug.py

lib/lp/bugs/model/bugtask.py

lib/lp/bugs/model/bugtracker.py

lib/lp/bugs/model/bugwatch.py

lib/lp/bugs/tests/test_bugtracker_components.py

lib/lp/bugs/windmill/testing.py

lib/lp/bugs/windmill/tests/test_bug_also_affects_new_upstream.py

lib/lp/bugs/windmill/tests/test_bug_commenting.py

lib/lp/bugs/windmill/tests/test_bug_inline_subscriber.py

lib/lp/bugs/windmill/tests/test_bug_me_too.py

lib/lp/bugs/windmill/tests/test_bug_privacy_settings.py

lib/lp/bugs/windmill/tests/test_filebug_dupe_finder.py

lib/lp/bugs/windmill/tests/test_filebug_extra_options.py

lib/lp/bugs/windmill/tests/test_mark_duplicate.py

lib/lp/bugs/windmill/tests/test_official_bug_tags_management.py

lib/lp/buildmaster/model/packagebuild.py

lib/lp/buildmaster/tests/test_packagebuild.py

lib/lp/code/browser/branch.py

lib/lp/code/browser/branchmergeproposal.py

lib/lp/code/browser/configure.zcml

lib/lp/code/browser/tests/test_branchmergeproposal.py

lib/lp/code/configure.zcml

lib/lp/code/enums.py

lib/lp/code/errors.py

lib/lp/code/interfaces/branch.py

lib/lp/code/interfaces/branchmergeproposal.py

lib/lp/code/interfaces/diff.py

lib/lp/code/interfaces/webservice.py

lib/lp/code/model/branch.py

lib/lp/code/model/branchmergeproposal.py

lib/lp/code/model/branchmergeproposaljob.py

lib/lp/code/model/branchnamespace.py

lib/lp/code/model/diff.py

lib/lp/code/model/sourcepackagerecipebuild.py

lib/lp/code/model/tests/test_branch.py

lib/lp/code/model/tests/test_branchmergeproposal.py

lib/lp/code/model/tests/test_branchmergeproposaljobs.py

lib/lp/code/model/tests/test_diff.py

lib/lp/code/model/tests/test_sourcepackagerecipe.py

lib/lp/code/model/tests/test_sourcepackagerecipebuild.py

lib/lp/code/scripts/tests/test_merge_proposal_jobs.py

lib/lp/code/stories/branches/xx-code-review-comments.txt

lib/lp/code/stories/webservice/xx-branch.txt

lib/lp/code/templates/branch-pending-merges.pt

lib/lp/code/templates/codereviewnewrevisions-footer.pt

lib/lp/code/windmill/testing.py

lib/lp/code/windmill/tests/test_branch_bugspeclinks.py

lib/lp/code/windmill/tests/test_branch_subscriptions.py

lib/lp/code/windmill/tests/test_branchmergeproposal_review.py

lib/lp/code/windmill/tests/test_productseries_setbranch.py

lib/lp/codehosting/scanner/tests/test_bzrsync.py

lib/lp/hardwaredb/model/hwdb.py

lib/lp/registry/browser/configure.zcml

lib/lp/registry/browser/distributionsourcepackage.py

lib/lp/registry/browser/person.py

lib/lp/registry/browser/product.py

lib/lp/registry/browser/tests/product-files-views.txt

lib/lp/registry/browser/tests/product-views.txt

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

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

lib/lp/registry/doc/vocabularies.txt

lib/lp/registry/errors.py

lib/lp/registry/interfaces/distroseriesdifference.py

lib/lp/registry/interfaces/person.py

lib/lp/registry/interfaces/product.py

lib/lp/registry/model/distribution.py

lib/lp/registry/model/distributionsourcepackage.py

lib/lp/registry/model/distroseriesdifference.py

lib/lp/registry/model/person.py

lib/lp/registry/model/pillar.py

lib/lp/registry/model/product.py

lib/lp/registry/model/projectgroup.py

lib/lp/registry/model/sourcepackage.py

lib/lp/registry/model/sourcepackagename.py

lib/lp/registry/templates/product-series.pt

lib/lp/registry/tests/test_distroseriesdifference.py

lib/lp/registry/tests/test_nameblacklist.py

lib/lp/registry/tests/test_person.py

lib/lp/registry/tests/test_product.py

lib/lp/registry/vocabularies.py

lib/lp/registry/windmill/testing.py

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

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

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

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

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

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

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

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

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

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

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

lib/lp/scripts/garbo.py

lib/lp/scripts/utilities/sanitizedb.py

lib/lp/services/database/bulk.py

lib/lp/services/mailman/doc/contact-address.txt

lib/lp/services/mailman/doc/create-lists.txt

lib/lp/services/mailman/doc/deactivate-lists.txt

lib/lp/services/mailman/doc/decorations.txt

lib/lp/services/mailman/doc/modify-lists.txt

lib/lp/services/mailman/doc/postings.txt

lib/lp/services/mailman/doc/reactivate-lists.txt

lib/lp/services/mailman/doc/recovery.txt

lib/lp/services/mailman/testing/helpers.py

lib/lp/services/worlddata/model/language.py

lib/lp/soyuz/doc/gina.txt

lib/lp/soyuz/doc/packageset.txt

lib/lp/soyuz/model/archivepermission.py

lib/lp/soyuz/model/binarypackagebuild.py

lib/lp/soyuz/model/binarypackagename.py

lib/lp/soyuz/model/distroarchseriesbinarypackage.py

lib/lp/soyuz/model/packagediff.py

lib/lp/soyuz/model/packageset.py

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/model/queue.py

lib/lp/soyuz/scripts/initialise_distroseries.py

lib/lp/soyuz/windmill/testing.py

lib/lp/soyuz/windmill/tests/test_archive_packages.py

lib/lp/soyuz/windmill/tests/test_archivesubscribersindex.py

lib/lp/soyuz/windmill/tests/test_ppainlineedit.py

lib/lp/testing/__init__.py

lib/lp/testing/factory.py

lib/lp/translations/model/pofile.py

lib/lp/translations/model/potemplate.py

lib/lp/translations/model/translationimportqueue.py

lib/lp/translations/scripts/migrate_variants.py

lib/lp/translations/windmill/testing.py

lib/lp/translations/windmill/tests/disabled_test_productseries_templates.py

lib/lp/translations/windmill/tests/test_documentation_links.py

lib/lp/translations/windmill/tests/test_import_queue.py

lib/lp/translations/windmill/tests/test_languages.py

lib/lp/translations/windmill/tests/test_pofile_translate.py

lib/lp/translations/windmill/tests/test_serieslanguages.py

setup.py

versions.cfg

Show diffs side-by-side

added added

removed removed

bzrplugins/difftacular@

bzrplugins/lpserve/__init__.py

bzrplugins/lpserve/test_lpserve.py

cronscripts/update-bugzilla-remote-components.py

cronscripts/update-remote-product.py

database/sampledata/current-dev.sql

database/sampledata/current.sql

database/schema/comments.sql

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

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

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

database/schema/security.cfg

database/schema/security.py

database/schema/trusted.sql

lib/canonical/buildd/buildrecipe

lib/canonical/buildd/debian/changelog

lib/canonical/config/__init__.py

lib/canonical/config/schema-lazr.conf

lib/canonical/launchpad/database/account.py

lib/canonical/launchpad/database/stormsugar.py

lib/canonical/launchpad/database/tests/test_stormextensions.py

lib/canonical/launchpad/doc/launchpadlib.txt

lib/canonical/launchpad/helpers.py

lib/canonical/launchpad/interfaces/_schema_circular_imports.py

lib/canonical/launchpad/scripts/bzremotecomponentfinder.py

lib/canonical/launchpad/scripts/updateremoteproduct.py

lib/canonical/launchpad/security.py

lib/canonical/launchpad/testing/browser.py

lib/canonical/launchpad/vocabularies/dbobjects.py

lib/canonical/launchpad/webapp/batching.py

lib/canonical/launchpad/webapp/configure.zcml

lib/canonical/launchpad/webapp/pgsession.py

lib/canonical/launchpad/webapp/tests/no-anonymous-session-cookies.txt

lib/canonical/launchpad/webapp/tests/test_login.py

lib/canonical/launchpad/webapp/vocabulary.py

lib/canonical/testing/__init__.py

lib/canonical/testing/layers.py

lib/lp/archivepublisher/ftparchive.py

lib/lp/bugs/browser/bugtracker.py

lib/lp/bugs/browser/configure.zcml

lib/lp/bugs/configure.zcml

lib/lp/bugs/doc/bugtask-find-similar.txt

lib/lp/bugs/interfaces/bug.py

lib/lp/bugs/interfaces/bugtracker.py

lib/lp/bugs/model/bug.py

lib/lp/bugs/model/bugtask.py

lib/lp/bugs/model/bugtracker.py

lib/lp/bugs/model/bugwatch.py

lib/lp/bugs/tests/test_bugtracker_components.py

lib/lp/bugs/tests/test_bzremotecomponentfinder.py

lib/lp/bugs/tests/testfiles/bugzilla-fdo-advanced-query.html

lib/lp/bugs/tests/testfiles/bugzilla-wine-advanced-query.html

lib/lp/bugs/windmill/testing.py

lib/lp/bugs/windmill/tests/test_bug_also_affects_new_upstream.py

lib/lp/bugs/windmill/tests/test_bug_commenting.py

lib/lp/bugs/windmill/tests/test_bug_inline_subscriber.py

lib/lp/bugs/windmill/tests/test_bug_me_too.py

lib/lp/bugs/windmill/tests/test_bug_privacy_settings.py

lib/lp/bugs/windmill/tests/test_filebug_dupe_finder.py

lib/lp/bugs/windmill/tests/test_filebug_extra_options.py

lib/lp/bugs/windmill/tests/test_mark_duplicate.py

lib/lp/bugs/windmill/tests/test_official_bug_tags_management.py

lib/lp/buildmaster/model/packagebuild.py

lib/lp/buildmaster/tests/test_packagebuild.py

lib/lp/code/browser/branch.py

lib/lp/code/browser/branchmergeproposal.py

lib/lp/code/browser/branchmergequeue.py

lib/lp/code/browser/configure.zcml

lib/lp/code/browser/tests/test_branchmergeproposal.py

lib/lp/code/browser/tests/test_branchmergequeue.py

lib/lp/code/configure.zcml

lib/lp/code/enums.py

lib/lp/code/errors.py

lib/lp/code/interfaces/branch.py

lib/lp/code/interfaces/branchmergeproposal.py

lib/lp/code/interfaces/branchmergequeue.py

lib/lp/code/interfaces/branchmergequeue.py

lib/lp/code/interfaces/diff.py

lib/lp/code/interfaces/webservice.py

lib/lp/code/model/branch.py

lib/lp/code/model/branchmergeproposal.py

lib/lp/code/model/branchmergeproposaljob.py

lib/lp/code/model/branchmergequeue.py

lib/lp/code/model/branchmergequeue.py

lib/lp/code/model/branchnamespace.py

lib/lp/code/model/diff.py

lib/lp/code/model/sourcepackagerecipebuild.py

lib/lp/code/model/tests/test_branch.py

lib/lp/code/model/tests/test_branchmergeproposal.py

lib/lp/code/model/tests/test_branchmergeproposaljobs.py

lib/lp/code/model/tests/test_branchmergequeue.py

lib/lp/code/model/tests/test_branchmergequeue.py

lib/lp/code/model/tests/test_diff.py

lib/lp/code/model/tests/test_sourcepackagerecipe.py

lib/lp/code/model/tests/test_sourcepackagerecipebuild.py

lib/lp/code/scripts/tests/test_merge_proposal_jobs.py

lib/lp/code/stories/branches/xx-code-review-comments.txt

lib/lp/code/stories/webservice/xx-branch.txt

lib/lp/code/templates/branch-pending-merges.pt

lib/lp/code/templates/branchmergequeue-index.pt

lib/lp/code/windmill/testing.py

lib/lp/code/windmill/tests/test_branch_bugspeclinks.py

lib/lp/code/windmill/tests/test_branch_subscriptions.py

lib/lp/code/windmill/tests/test_branchmergeproposal_review.py

lib/lp/code/windmill/tests/test_productseries_setbranch.py

lib/lp/codehosting/scanner/tests/test_bzrsync.py

lib/lp/hardwaredb/model/hwdb.py

lib/lp/registry/browser/configure.zcml

lib/lp/registry/browser/distributionsourcepackage.py

lib/lp/registry/browser/person.py

lib/lp/registry/browser/product.py

lib/lp/registry/browser/tests/product-files-views.txt

lib/lp/registry/browser/tests/product-views.txt

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

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

lib/lp/registry/doc/vocabularies.txt

lib/lp/registry/errors.py

lib/lp/registry/exceptions.py

lib/lp/registry/interfaces/distroseriesdifference.py

lib/lp/registry/interfaces/person.py

lib/lp/registry/interfaces/product.py

lib/lp/registry/model/distribution.py

lib/lp/registry/model/distributionsourcepackage.py

lib/lp/registry/model/distroseriesdifference.py

lib/lp/registry/model/person.py

lib/lp/registry/model/pillar.py

lib/lp/registry/model/product.py

lib/lp/registry/model/projectgroup.py

lib/lp/registry/model/sourcepackage.py

lib/lp/registry/model/sourcepackagename.py

lib/lp/registry/templates/product-series.pt

lib/lp/registry/tests/test_distroseriesdifference.py

lib/lp/registry/tests/test_nameblacklist.py

lib/lp/registry/tests/test_person.py

lib/lp/registry/tests/test_product.py

lib/lp/registry/vocabularies.py

lib/lp/registry/windmill/testing.py

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

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

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

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

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

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

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

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

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

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

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

lib/lp/scripts/garbo.py

lib/lp/scripts/utilities/sanitizedb.py

lib/lp/services/database/bulk.py

lib/lp/services/mailman/doc/contact-address.txt

lib/lp/services/mailman/doc/create-lists.txt

lib/lp/services/mailman/doc/deactivate-lists.txt

lib/lp/services/mailman/doc/decorations.txt

lib/lp/services/mailman/doc/modify-lists.txt

lib/lp/services/mailman/doc/postings.txt

lib/lp/services/mailman/doc/reactivate-lists.txt

lib/lp/services/mailman/doc/recovery.txt

lib/lp/services/mailman/testing/helpers.py

lib/lp/services/worlddata/model/language.py

lib/lp/soyuz/doc/gina.txt

lib/lp/soyuz/doc/packageset.txt

lib/lp/soyuz/model/archivepermission.py

lib/lp/soyuz/model/binarypackagebuild.py

lib/lp/soyuz/model/binarypackagename.py

lib/lp/soyuz/model/distroarchseriesbinarypackage.py

lib/lp/soyuz/model/packagediff.py

lib/lp/soyuz/model/packageset.py

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/model/queue.py

lib/lp/soyuz/scripts/initialise_distroseries.py

lib/lp/soyuz/windmill/testing.py

lib/lp/soyuz/windmill/tests/test_archive_packages.py

lib/lp/soyuz/windmill/tests/test_archivesubscribersindex.py

lib/lp/soyuz/windmill/tests/test_ppainlineedit.py

lib/lp/testing/__init__.py

lib/lp/testing/factory.py

lib/lp/translations/model/pofile.py

lib/lp/translations/model/potemplate.py

lib/lp/translations/model/translationimportqueue.py

lib/lp/translations/scripts/migrate_variants.py

lib/lp/translations/windmill/testing.py

lib/lp/translations/windmill/tests/disabled_test_productseries_templates.py

lib/lp/translations/windmill/tests/test_documentation_links.py

lib/lp/translations/windmill/tests/test_import_queue.py

lib/lp/translations/windmill/tests/test_languages.py

lib/lp/translations/windmill/tests/test_pofile_translate.py

lib/lp/translations/windmill/tests/test_serieslanguages.py

Older »