← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 7675.76.1.

Committer: Michael Hudson
Date: 2009-03-25 20:23:31 UTC
mfrom: (8072 devel)
mto: (7675.62.35 db-devel) (9905.7.1 hg-imports)
mto: This revision was merged to the branch mainline in revision 8091.
Revision ID: michael.hudson@canonical.com-20090325202331-hapjx4ebcy782rxv

merge stable fixing conflicts

files added:
lib/canonical/launchpad/doc/webservice-marshallers.txt

lib/canonical/launchpad/pagetests/branches/xx-branch-listings-merge-proposal-badge.txt

lib/canonical/launchpad/pagetests/branches/xx-junk-branches.txt

lib/canonical/lazr/rest/example/tests/hostedfile.txt

lib/canonical/lazr/rest/example/tests/wadl.txt

files renamed:
lib/canonical/launchpad/doc/webservice-marshallers.txt => lib/canonical/lazr/doc/webservice-marshallers.txt

files modified:
database/schema/security.cfg

lib/canonical/archiveuploader/tests/test_uploadprocessor.py

lib/canonical/archiveuploader/uploadprocessor.py

lib/canonical/codehosting/inmemory.py

lib/canonical/launchpad/browser/branch.py

lib/canonical/launchpad/browser/branchlisting.py

lib/canonical/launchpad/browser/bugtask.py

lib/canonical/launchpad/browser/codereviewcomment.py

lib/canonical/launchpad/browser/tests/test_codereviewcomment.py

lib/canonical/launchpad/components/bugchange.py

lib/canonical/launchpad/database/branchcollection.py

lib/canonical/launchpad/database/branchnamespace.py

lib/canonical/launchpad/database/branchtarget.py

lib/canonical/launchpad/database/bug.py

lib/canonical/launchpad/database/sourcepackage.py

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

lib/canonical/launchpad/doc/badges.txt

lib/canonical/launchpad/doc/bug-change.txt

lib/canonical/launchpad/doc/bug-pages.txt

lib/canonical/launchpad/doc/bug.txt

lib/canonical/launchpad/doc/specgraph.txt

lib/canonical/launchpad/doc/xmlrpc-authserver.txt

lib/canonical/launchpad/ftests/_login.py

lib/canonical/launchpad/icing/style.css

lib/canonical/launchpad/interfaces/authserver.py

lib/canonical/launchpad/interfaces/branchcollection.py

lib/canonical/launchpad/interfaces/branchnamespace.py

lib/canonical/launchpad/interfaces/bug.py

lib/canonical/launchpad/interfaces/bugchange.py

lib/canonical/launchpad/interfaces/sourcepackage.py

lib/canonical/launchpad/pagetests/branches/xx-branch-merge-proposals.txt

lib/canonical/launchpad/pagetests/branches/xx-branchmergeproposal-listings.txt

lib/canonical/launchpad/pagetests/branches/xx-creating-branches.txt

lib/canonical/launchpad/pagetests/bugs/xx-bug-activity.txt

lib/canonical/launchpad/pagetests/webservice/xx-bug.txt

lib/canonical/launchpad/pagetests/webservice/xx-hostedfile.txt

lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt

lib/canonical/launchpad/pagetitles.py

lib/canonical/launchpad/templates/bugcomment-macros.pt

lib/canonical/launchpad/templates/bugtask-index.pt

lib/canonical/launchpad/templates/product-active-reviews.pt

lib/canonical/launchpad/testing/__init__.py

lib/canonical/launchpad/testing/factory.py

lib/canonical/launchpad/tests/test_branchnamespace.py

lib/canonical/launchpad/tests/test_branchtarget.py

lib/canonical/launchpad/tests/test_bugchanges.py

lib/canonical/launchpad/webapp/badge.py

lib/canonical/launchpad/windmill/tests/test_bugs/test_mark_duplicate.py

lib/canonical/launchpad/xmlrpc/authserver.py

lib/canonical/launchpad/xmlrpc/codehosting.py

lib/canonical/launchpad/xmlrpc/tests/test_codehosting.py

lib/canonical/launchpad/zcml/bug.zcml

lib/canonical/launchpad/zcml/webservice.zcml

lib/canonical/lazr/doc/webservice.txt

lib/canonical/lazr/rest/configure.zcml

lib/canonical/lazr/rest/example/configure.zcml

lib/canonical/lazr/rest/example/interfaces.py

lib/canonical/lazr/rest/example/root.py

lib/canonical/lazr/rest/example/tests/collection.txt

lib/canonical/lazr/rest/ftesting.zcml

utilities/rocketfuel-setup

Show diffs side-by-side

added added

removed removed

database/schema/security.cfg

lib/canonical/archiveuploader/tests/test_uploadprocessor.py

lib/canonical/archiveuploader/uploadprocessor.py

lib/canonical/codehosting/inmemory.py

lib/canonical/launchpad/browser/branch.py

lib/canonical/launchpad/browser/branchlisting.py

lib/canonical/launchpad/browser/bugtask.py

lib/canonical/launchpad/browser/codereviewcomment.py

lib/canonical/launchpad/browser/tests/test_codereviewcomment.py

lib/canonical/launchpad/components/bugchange.py

lib/canonical/launchpad/database/branchcollection.py

lib/canonical/launchpad/database/branchnamespace.py

lib/canonical/launchpad/database/branchtarget.py

lib/canonical/launchpad/database/bug.py

lib/canonical/launchpad/database/sourcepackage.py

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

lib/canonical/launchpad/doc/badges.txt

lib/canonical/launchpad/doc/bug-change.txt

lib/canonical/launchpad/doc/bug-pages.txt

lib/canonical/launchpad/doc/bug.txt

lib/canonical/launchpad/doc/specgraph.txt

lib/canonical/launchpad/doc/webservice-marshallers.txt

lib/canonical/launchpad/doc/xmlrpc-authserver.txt

lib/canonical/launchpad/ftests/_login.py

lib/canonical/launchpad/icing/style.css

lib/canonical/launchpad/interfaces/authserver.py

lib/canonical/launchpad/interfaces/branchcollection.py

lib/canonical/launchpad/interfaces/branchnamespace.py

lib/canonical/launchpad/interfaces/bug.py

lib/canonical/launchpad/interfaces/bugchange.py

lib/canonical/launchpad/interfaces/sourcepackage.py

lib/canonical/launchpad/pagetests/branches/xx-branch-listings-merge-proposal-badge.txt

lib/canonical/launchpad/pagetests/branches/xx-branch-merge-proposals.txt

lib/canonical/launchpad/pagetests/branches/xx-branchmergeproposal-listings.txt

lib/canonical/launchpad/pagetests/branches/xx-creating-branches.txt

lib/canonical/launchpad/pagetests/branches/xx-junk-branches.txt

lib/canonical/launchpad/pagetests/bugs/xx-bug-activity.txt

lib/canonical/launchpad/pagetests/webservice/xx-bug.txt

lib/canonical/launchpad/pagetests/webservice/xx-hostedfile.txt

lib/canonical/launchpad/pagetests/webservice/xx-wadl.txt

lib/canonical/launchpad/pagetitles.py

lib/canonical/launchpad/templates/bugcomment-macros.pt

lib/canonical/launchpad/templates/bugtask-index.pt

lib/canonical/launchpad/templates/product-active-reviews.pt

lib/canonical/launchpad/testing/__init__.py

lib/canonical/launchpad/testing/factory.py

lib/canonical/launchpad/tests/test_branchnamespace.py

lib/canonical/launchpad/tests/test_branchtarget.py

lib/canonical/launchpad/tests/test_bugchanges.py

lib/canonical/launchpad/webapp/badge.py

lib/canonical/launchpad/windmill/tests/test_bugs/test_mark_duplicate.py

lib/canonical/launchpad/xmlrpc/authserver.py

lib/canonical/launchpad/xmlrpc/codehosting.py

lib/canonical/launchpad/xmlrpc/tests/test_codehosting.py

lib/canonical/launchpad/zcml/bug.zcml

lib/canonical/launchpad/zcml/webservice.zcml

lib/canonical/lazr/doc/webservice-marshallers.txt

lib/canonical/lazr/doc/webservice.txt

lib/canonical/lazr/rest/configure.zcml

lib/canonical/lazr/rest/example/configure.zcml

lib/canonical/lazr/rest/example/interfaces.py

lib/canonical/lazr/rest/example/root.py

lib/canonical/lazr/rest/example/tests/collection.txt

lib/canonical/lazr/rest/example/tests/hostedfile.txt

lib/canonical/lazr/rest/example/tests/wadl.txt

lib/canonical/lazr/rest/ftesting.zcml

utilities/rocketfuel-setup

Older »