Viewing all changes in revision 12406.
- Committer: Brad Crittenden
- Date: 2011-02-28 14:19:28 UTC
- mfrom: (12393.2.88 launchpad)
- Revision ID: bac@canonical.com-20110228141928-ocszdg7fdcax9j8e
Merge from devel
- files added:
- bzrplugins/optional/README
- lib/lp/blueprints/mail/tests
- utilities/snakefood
- zcml
- files removed:
- BRANCH.TODO
- benchmarks
- lib/canonical/ftests
- lib/canonical/launchpad/javascript/client
- lib/canonical/widgets
- logs
- todo
- files renamed:
- optionalbzrplugins/ => bzrplugins/optional/
- lib/canonical/launchpad/javascript/client/client.js => lib/lp/app/javascript/client.js
- lib/canonical/encoding.py => lib/lp/services/encoding.py
- lib/canonical/mem.py => lib/lp/services/profile/mem.py
- lib/canonical/tests/test_encoding.py => lib/lp/services/tests/test_encoding.py
- lib/canonical/zeca/ => lib/lp/testing/keyserver/
- lib/canonical/zeca/ftests/harness.py => lib/lp/testing/keyserver/harness.py
- daemons/zeca.tac => lib/lp/testing/keyserver/testkeyserver.tac
- lib/canonical/zeca/ftests/ => lib/lp/testing/keyserver/tests/
- lib/canonical/zeca/zeca.py => lib/lp/testing/keyserver/web.py
- lib/canonical/ftests/pgsql.py => lib/lp/testing/pgsql.py
- lib/canonical/ftests/test_pgsql.py => lib/lp/testing/tests/test_pgsql.py
- lib/canonical/functional.py => lib/lp/testing/xmlrpc.py
- lib/canonical/tests/ => lib/lp/tests/
- lp-sfood-packages => utilities/snakefood/lp-sfood-packages
- ftesting.zcml => zcml/ftesting.zcml
- override-configure-normal.zcml => zcml/override-configure-normal.zcml
- override-configure-testing.zcml => zcml/override-configure-testing.zcml
- override-configure.zcml => zcml/override-configure.zcml
- override-includes/ => zcml/override-includes/
- override-meta.zcml => zcml/override-meta.zcml
- package-includes/ => zcml/package-includes/
- script-testing.zcml => zcml/script-testing.zcml
- script.zcml => zcml/script.zcml
- securitypolicy.zcml => zcml/securitypolicy.zcml
- summarizerequests.zcml => zcml/summarizerequests.zcml
- zopeapp.zcml => zcml/zopeapp.zcml
- zopeappbrowser.zcml => zcml/zopeappbrowser.zcml
- zopeappsession.zcml => zcml/zopeappsession.zcml
- files modified:
- .bzrignore
expand all
collapse all
added
removed
