Viewing all changes in revision 14584.1.3.
- Committer: Gavin Panella
- Date: 2012-01-03 12:03:22 UTC
- mfrom: (14620 devel)
- mto: (14557.2.5 redo-read-only-transactions-in-buildmaster)
- mto: This revision was merged to the branch mainline in revision 14640.
- Revision ID: gavin.panella@canonical.com-20120103120322-r7jd1yzc6lfi6zfa
Merged devel into fix-retest-colorize.
- files added:
- configs/schema-lazr.conf
- lib/canonical/config
- lib/canonical/config/__init__.py
- lib/canonical/config/schema-lazr.conf
- lib/canonical/database
- lib/lp/services/feeds/interfaces
- lib/lp/services/librarian/interfaces
- lib/lp/services/librarianserver/doc
- lib/lp/services/privacy
- lib/lp/xmlrpc/doc
- lib/lp/xmlrpc/tests
- files removed:
- configs/schema-lazr.conf
- lib/canonical/database
- lib/canonical/database/ftests
- lib/canonical/database/tests
- lib/canonical/launchpad/doc
- lib/canonical/launchpad/ftests
- lib/canonical/launchpad/tests
- lib/canonical/lazr
- lib/canonical/lazr/doc
- lib/canonical/lazr/feed
- lib/canonical/lazr/interfaces
- lib/canonical/lazr/testing
- lib/canonical/lazr/tests
- lib/canonical/lazr/tests/data
- lib/canonical/librarian/ftests
- lib/canonical/testing
- lib/canonical/testing/ftests
- files renamed:
- lib/canonical/lazr/folder.py => lib/lp/app/browser/folder.py
- lib/canonical/lazr/doc/menus.txt => lib/lp/app/doc/menus.txt
- lib/canonical/lazr/doc/folder.txt => lib/lp/app/stories/folder.txt
- lib/canonical/launchpad/webapp/templates/protocol-error.pt => lib/lp/app/templates/protocol-error.pt
- lib/canonical/launchpad/layers.py => lib/lp/layers.py
- lib/canonical/launchpad/locales/ => lib/lp/locales/
- lib/canonical/launchpad/permissions.zcml => lib/lp/permissions.zcml
- lib/canonical/database/harness.py => lib/lp/scripts/harness.py *
- lib/canonical/launchpad/security.py => lib/lp/security.py
- lib/canonical/config/ => lib/lp/services/config/
- lib/canonical/launchpad/daemons/ => lib/lp/services/daemons/
- lib/canonical/database/constants.py => lib/lp/services/database/constants.py
- lib/canonical/database/datetimecol.py => lib/lp/services/database/datetimecol.py
- lib/canonical/database/debug.py => lib/lp/services/database/debug.py
- lib/canonical/database/ftests/test_multitablecopy.txt => lib/lp/services/database/doc/multitablecopy.txt
- lib/canonical/database/ftests/test_sqlbaseconnect.txt => lib/lp/services/database/doc/sqlbaseconnect.txt
- lib/canonical/database/enumcol.py => lib/lp/services/database/enumcol.py
- lib/canonical/database/interfaces.py => lib/lp/services/database/interfaces.py
- lib/canonical/database/multitablecopy.py => lib/lp/services/database/multitablecopy.py
- lib/canonical/database/nl_search.py => lib/lp/services/database/nl_search.py
- lib/canonical/database/postgresql.py => lib/lp/services/database/postgresql.py
- lib/canonical/launchpad/readonly.py => lib/lp/services/database/readonly.py
- lib/canonical/database/sort_sql.py => lib/lp/services/database/sort_sql.py
- lib/canonical/database/sqlbase.py => lib/lp/services/database/sqlbase.py
- lib/canonical/database/tests/enumeration.py => lib/lp/services/database/tests/enumeration.py
- lib/canonical/launchpad/tests/readonly.py => lib/lp/services/database/tests/readonly.py
- lib/canonical/database/ftests/script_isolation.py => lib/lp/services/database/tests/script_isolation.py
- lib/canonical/database/tests/test_connectionstring.py => lib/lp/services/database/tests/test_connectionstring.py
- lib/canonical/database/ftests/test_isolation.py => lib/lp/services/database/tests/test_isolation_changes.py
- lib/canonical/database/ftests/test_postgresql.py => lib/lp/services/database/tests/test_postgresql.py
- lib/canonical/launchpad/tests/test_readonly.py => lib/lp/services/database/tests/test_readonly.py
- lib/canonical/database/tests/test_rundoctests.py => lib/lp/services/database/tests/test_rundoctests.py
- lib/canonical/database/tests/test_sqlbase.py => lib/lp/services/database/tests/test_sqlbase.py
- lib/canonical/lazr/doc/pidfile.txt => lib/lp/services/doc/pidfile.txt
- lib/canonical/lazr/doc/timeout.txt => lib/lp/services/doc/timeout.txt
- lib/canonical/lazr/feed/feed.py => lib/lp/services/feeds/feed.py
- lib/lp/services/feeds/interfaces.py => lib/lp/services/feeds/interfaces/application.py
- lib/canonical/lazr/interfaces/feed.py => lib/lp/services/feeds/interfaces/feed.py
- lib/lp/services/session/stories/ => lib/lp/services/feeds/stories/
- lib/canonical/lazr/feed/templates/ => lib/lp/services/feeds/templates/
- lib/canonical/launchpad/helpers.py => lib/lp/services/helpers.py
- lib/canonical/librarian/client.py => lib/lp/services/librarian/client.py
- lib/canonical/librarian/configure.zcml => lib/lp/services/librarian/client.zcml
- lib/lp/services/librarian/interfaces.py => lib/lp/services/librarian/interfaces/__init__.py
- lib/canonical/librarian/interfaces.py => lib/lp/services/librarian/interfaces/client.py
- lib/canonical/librarian/smoketest.py => lib/lp/services/librarian/smoketest.py *
- lib/canonical/librarian/ftests/test_client.py => lib/lp/services/librarian/tests/test_client.py
- lib/canonical/librarian/tests/test_smoketest.py => lib/lp/services/librarian/tests/test_smoketest.py
- lib/canonical/librarian/tests/test_utils.py => lib/lp/services/librarian/tests/test_utils.py
- lib/canonical/librarian/utils.py => lib/lp/services/librarian/utils.py
- lib/canonical/librarian/ => lib/lp/services/librarianserver/
- lib/lp/services/librarian/apachelogparser.py => lib/lp/services/librarianserver/apachelogparser.py
- lib/canonical/librarian/tests/librarian-report.txt => lib/lp/services/librarianserver/doc/librarian-report.txt
- lib/canonical/librarian/tests/test_upload.txt => lib/lp/services/librarianserver/doc/upload.txt
- lib/lp/services/librarian/tests/test_apachelogparser.py => lib/lp/services/librarianserver/tests/test_apachelogparser.py
- lib/canonical/librarian/ftests/test_db.py => lib/lp/services/librarianserver/tests/test_db.py
- lib/canonical/librarian/ftests/test_gc.py => lib/lp/services/librarianserver/tests/test_gc.py
- lib/canonical/librarian/ftests/test_storage.py => lib/lp/services/librarianserver/tests/test_storage_db.py
- lib/canonical/librarian/ftests/test_web.py => lib/lp/services/librarianserver/tests/test_web.py
- lib/canonical/lazr/pidfile.py => lib/lp/services/pidfile.py
- lib/canonical/lazr/privacy.py => lib/lp/services/privacy/adapters.py
- lib/canonical/lazr/interfaces/objectprivacy.py => lib/lp/services/privacy/interfaces.py
- lib/canonical/launchpad/searchbuilder.py => lib/lp/services/searchbuilder.py
- lib/canonical/testing/customresult.py => lib/lp/services/testing/customresult.py
- lib/canonical/testing/doctestcodec.py => lib/lp/services/testing/doctestcodec.py
- lib/canonical/testing/parallel.py => lib/lp/services/testing/parallel.py
- lib/canonical/testing/profiled.py => lib/lp/services/testing/profiled.py
- lib/canonical/testing/tests/ => lib/lp/services/testing/tests/
- lib/canonical/launchpad/tests/test_helpers.py => lib/lp/services/tests/test_helpers.py
- lib/canonical/lazr/tests/catalog/ => lib/lp/services/tests/testfiles/catalog/
- lib/canonical/lazr/timeout.py => lib/lp/services/timeout.py
- lib/canonical/launchpad/webapp/ => lib/lp/services/webapp/
- lib/canonical/lazr/canonicalurl.py => lib/lp/services/webapp/canonicalurl.py
- lib/canonical/lazr/doc/canonicalurl.txt => lib/lp/services/webapp/doc/canonicalurl.txt
- lib/canonical/launchpad/doc/timeout.txt => lib/lp/services/webapp/doc/timeout.txt
- lib/canonical/launchpad/doc/xmlrpc-infrastructure.txt => lib/lp/services/webapp/doc/xmlrpc-infrastructure.txt
- lib/canonical/lazr/interfaces/timezone.py => lib/lp/services/worlddata/interfaces/timezone.py
- lib/canonical/lazr/xml.py => lib/lp/services/xml.py
- lib/canonical/launchpad/systemhomes.py => lib/lp/systemhomes.py
- lib/canonical/launchpad/ftests/_launchpadformharness.py => lib/lp/testing/deprecated.py
- lib/canonical/launchpad/doc/sample-data-assertions.txt => lib/lp/testing/doc/sample-data-assertions.txt
- lib/canonical/lazr/testing/event.py => lib/lp/testing/event.py
- lib/canonical/testing/layers.py => lib/lp/testing/layers.py
- lib/canonical/lazr/testing/menus.py => lib/lp/testing/menu.py
- lib/canonical/testing/mockdb.py => lib/lp/testing/mockdb.py
- lib/canonical/launchpad/ftests/script.py => lib/lp/testing/script.py
- lib/canonical/testing/smtpd.py => lib/lp/testing/smtpd.py
- lib/canonical/testing/tests/test_layers.py => lib/lp/testing/tests/test_layers.py
- lib/canonical/testing/ftests/test_layers.py => lib/lp/testing/tests/test_layers_functional.py
- lib/canonical/testing/tests/test_mockdb.py => lib/lp/testing/tests/test_mockdb.py
- lib/canonical/testing/ftests/test_mockdb.py => lib/lp/testing/tests/test_mockdb_functional.py
- lib/canonical/launchpad/tests/test_sampledata.py => lib/lp/testing/tests/test_sampledata.py
- lib/canonical/launchpad/ftests/test_opensource.py => lib/lp/tests/test_opensource.py
- lib/canonical/launchpad/xmlrpc/ => lib/lp/xmlrpc/
- lib/canonical/launchpad/doc/private-xmlrpc.txt => lib/lp/xmlrpc/doc/private-xmlrpc.txt
- lib/canonical/launchpad/doc/xmlrpc-selftest.txt => lib/lp/xmlrpc/doc/xmlrpc-selftest.txt
- files modified:
- Makefile
expand all
collapse all
added
removed
