← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 9893.7.2.

Committer: Stuart Bishop
Date: 2011-08-22 09:22:38 UTC
mfrom: (13752 devel)
mto: (9893.9.16 distinct-db-users)
mto: This revision was merged to the branch mainline in revision 13834.
Revision ID: stuart.bishop@canonical.com-20110822092238-o7vk8wecrorosn2u

Merged rocketfuel into trivial.

files removed:
lib/canonical/launchpad/scripts/ftests/test_keyringtrustanalyser.py

lib/lp/registry/scripts/keyringtrustanalyser.py

scripts/find-email-clusters.py

scripts/merge-email-clusters.py

files modified:
lib/canonical/launchpad/interfaces/gpghandler.py

lib/canonical/launchpad/utilities/ftests/test_gpghandler.py

lib/canonical/launchpad/utilities/gpghandler.py

lib/lp/bugs/configure.zcml

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

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

versions.cfg

Show diffs side-by-side

added added

removed removed

lib/canonical/launchpad/interfaces/gpghandler.py

lib/canonical/launchpad/scripts/ftests/test_keyringtrustanalyser.py

lib/canonical/launchpad/utilities/ftests/test_gpghandler.py

lib/canonical/launchpad/utilities/gpghandler.py

lib/lp/bugs/configure.zcml

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

lib/lp/registry/scripts/keyringtrustanalyser.py

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

scripts/find-email-clusters.py

scripts/merge-email-clusters.py

Older »