← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 6523.3.3.

Committer: Francis J. Lacoste
Date: 2008-06-19 20:44:46 UTC
mfrom: (6527 launchpad)
mto: This revision was merged to the branch mainline in revision 6535.
Revision ID: francis.lacoste@canonical.com-20080619204446-z5b4znmnkk4a3w1v

Merge RF, resolving 1 conflict.

files added:
database/schema/patch-121-48-0.sql

database/schema/patch-121-60-0.sql

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

lib/canonical/launchpad/database/account.py

lib/canonical/launchpad/doc/account.txt

lib/canonical/launchpad/doc/close-account.txt

lib/canonical/launchpad/interfaces/account.py

lib/canonical/launchpad/zcml/account.zcml

files removed:
lib/canonical/launchpad/doc/validpersonorteamcache.txt

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

files renamed:
database-frozen.txt => database-not-frozen.txt

files modified:
BRANCH.TODO

Makefile

cronscripts/_pythonpath.py

database/sampledata/current.sql

database/schema/comments.sql

database/schema/fti.py

database/schema/security.cfg

database/schema/trusted.sql

database/schema/upgrade.py

lib/canonical/authserver/tests/test_database.py

lib/canonical/config/schema-lazr.conf

lib/canonical/database/ftests/script_isolation.py

lib/canonical/database/ftests/test_isolation.py

lib/canonical/launchpad/browser/codeimport.py

lib/canonical/launchpad/browser/logintoken.py

lib/canonical/launchpad/browser/productseries.py

lib/canonical/launchpad/database/__init__.py

lib/canonical/launchpad/database/codeimport.py

lib/canonical/launchpad/database/codeimportjob.py

lib/canonical/launchpad/database/emailaddress.py

lib/canonical/launchpad/database/openidserver.py

lib/canonical/launchpad/database/person.py

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

lib/canonical/launchpad/doc/codeimport.txt

lib/canonical/launchpad/doc/notification-recipient-set.txt

lib/canonical/launchpad/doc/person.txt

lib/canonical/launchpad/doc/todo.txt

lib/canonical/launchpad/ftests/_login.py

lib/canonical/launchpad/ftests/test_person.py

lib/canonical/launchpad/ftests/test_system_documentation.py

lib/canonical/launchpad/ftests/test_teammembership.py

lib/canonical/launchpad/interfaces/__init__.py

lib/canonical/launchpad/interfaces/codeimport.py

lib/canonical/launchpad/interfaces/emailaddress.py

lib/canonical/launchpad/interfaces/person.py

lib/canonical/launchpad/mailout/codeimport.py

lib/canonical/launchpad/pagetests/codeimport/xx-edit-codeimport.txt

lib/canonical/launchpad/pagetests/standalone/xx-invalid-people-cant-login.txt

lib/canonical/launchpad/pagetests/standalone/xx-login-without-preferredemail.txt

lib/canonical/launchpad/scripts/bugexpire.py

lib/canonical/launchpad/scripts/checkwatches.py

lib/canonical/launchpad/scripts/tests/test_listteammembers.py

lib/canonical/launchpad/security.py

lib/canonical/launchpad/templates/product-review-license.pt

lib/canonical/launchpad/testing/factory.py

lib/canonical/launchpad/validators/person.py

lib/canonical/launchpad/vocabularies/dbobjects.py

lib/canonical/launchpad/webapp/authentication.py

lib/canonical/launchpad/webapp/authorization.py

lib/canonical/launchpad/webapp/interfaces.py

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

lib/canonical/launchpad/zcml/codeimport.zcml

lib/canonical/launchpad/zcml/configure.zcml

scripts/_pythonpath.py

scripts/close-account.py

scripts/ftpmaster-tools/_pythonpath.py

scripts/rosetta/_pythonpath.py

sourcecode/Makefile

test.py

Show diffs side-by-side

added added

removed removed

cronscripts/_pythonpath.py

database/sampledata/current.sql

database/schema/comments.sql

database/schema/fti.py

database/schema/patch-121-48-0.sql

database/schema/patch-121-60-0.sql

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

database/schema/security.cfg

database/schema/trusted.sql

database/schema/upgrade.py

lib/canonical/authserver/tests/test_database.py

lib/canonical/config/schema-lazr.conf

lib/canonical/database/ftests/script_isolation.py

lib/canonical/database/ftests/test_isolation.py

lib/canonical/launchpad/browser/codeimport.py

lib/canonical/launchpad/browser/logintoken.py

lib/canonical/launchpad/browser/productseries.py

lib/canonical/launchpad/database/__init__.py

lib/canonical/launchpad/database/account.py

lib/canonical/launchpad/database/codeimport.py

lib/canonical/launchpad/database/codeimportjob.py

lib/canonical/launchpad/database/emailaddress.py

lib/canonical/launchpad/database/openidserver.py

lib/canonical/launchpad/database/person.py

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

lib/canonical/launchpad/doc/account.txt

lib/canonical/launchpad/doc/close-account.txt

lib/canonical/launchpad/doc/codeimport.txt

lib/canonical/launchpad/doc/notification-recipient-set.txt

lib/canonical/launchpad/doc/person.txt

lib/canonical/launchpad/doc/todo.txt

lib/canonical/launchpad/doc/validpersonorteamcache.txt

lib/canonical/launchpad/ftests/_login.py

lib/canonical/launchpad/ftests/test_person.py

lib/canonical/launchpad/ftests/test_system_documentation.py

lib/canonical/launchpad/ftests/test_teammembership.py

lib/canonical/launchpad/interfaces/__init__.py

lib/canonical/launchpad/interfaces/account.py

lib/canonical/launchpad/interfaces/codeimport.py

lib/canonical/launchpad/interfaces/emailaddress.py

lib/canonical/launchpad/interfaces/person.py

lib/canonical/launchpad/mailout/codeimport.py

lib/canonical/launchpad/pagetests/codeimport/xx-edit-codeimport.txt

lib/canonical/launchpad/scripts/bugexpire.py

lib/canonical/launchpad/scripts/checkwatches.py

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

lib/canonical/launchpad/scripts/tests/test_listteammembers.py

lib/canonical/launchpad/security.py

lib/canonical/launchpad/templates/product-review-license.pt

lib/canonical/launchpad/testing/factory.py

lib/canonical/launchpad/validators/person.py

lib/canonical/launchpad/vocabularies/dbobjects.py

lib/canonical/launchpad/webapp/authentication.py

lib/canonical/launchpad/webapp/authorization.py

lib/canonical/launchpad/webapp/interfaces.py

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

lib/canonical/launchpad/zcml/account.zcml

lib/canonical/launchpad/zcml/codeimport.zcml

lib/canonical/launchpad/zcml/configure.zcml

scripts/_pythonpath.py

scripts/close-account.py

scripts/ftpmaster-tools/_pythonpath.py

scripts/rosetta/_pythonpath.py

sourcecode/Makefile

Older »