Viewing all changes in revision 1102.1.159.
- Committer: Gustavo Niemeyer
- Date: 2005-11-17 21:44:26 UTC
- mfrom: (2833)
- mto: This revision was merged to the branch mainline in revision 2836.
- Revision ID: gustavo@niemeyer.net-20051117214426-136d59de158bd654
Merging from rocketfuel HEAD, fixing conflicts.
- files added:
- database/schema/launchpad-40-00-0.sql
- files removed:
- configs/production/launchpad-sql-configure-normal.zcml
- configs/production1/launchpad-sql-configure-normal.zcml
- configs/production2/launchpad-sql-configure-normal.zcml
- files renamed:
- database/schema/initial-karma-data.sql => database/schema/archive/initial-karma-data.sql
- database/schema/launchpad-25-00-0.sql => database/schema/archive/launchpad-25-00-0.sql
- database/schema/patch-25-00-0.sql => database/schema/archive/patch-25-00-0.sql
- database/schema/patch-25-01-0.sql => database/schema/archive/patch-25-01-0.sql
- database/schema/patch-25-02-0.sql => database/schema/archive/patch-25-02-0.sql
- database/schema/patch-25-03-0.sql => database/schema/archive/patch-25-03-0.sql
- database/schema/patch-25-04-0.sql => database/schema/archive/patch-25-04-0.sql
- database/schema/patch-25-05-0.sql => database/schema/archive/patch-25-05-0.sql
- database/schema/patch-25-06-0.sql => database/schema/archive/patch-25-06-0.sql
- database/schema/patch-25-07-0.sql => database/schema/archive/patch-25-07-0.sql
- database/schema/patch-25-08-0.sql => database/schema/archive/patch-25-08-0.sql
- database/schema/patch-25-09-0.sql => database/schema/archive/patch-25-09-0.sql
- database/schema/patch-25-09-1.sql => database/schema/archive/patch-25-09-1.sql
- database/schema/patch-25-10-0.sql => database/schema/archive/patch-25-10-0.sql
- database/schema/patch-25-10-1.sql => database/schema/archive/patch-25-10-1.sql
- database/schema/patch-25-11-0.sql => database/schema/archive/patch-25-11-0.sql
- database/schema/patch-25-12-0.sql => database/schema/archive/patch-25-12-0.sql
- database/schema/patch-25-13-0.sql => database/schema/archive/patch-25-13-0.sql
- database/schema/patch-25-14-0.sql => database/schema/archive/patch-25-14-0.sql
- database/schema/patch-25-14-1.sql => database/schema/archive/patch-25-14-1.sql
- database/schema/patch-25-15-0.sql => database/schema/archive/patch-25-15-0.sql
- database/schema/patch-25-16-0.sql => database/schema/archive/patch-25-16-0.sql
- database/schema/patch-25-17-0.sql => database/schema/archive/patch-25-17-0.sql
- database/schema/patch-25-18-0.sql => database/schema/archive/patch-25-18-0.sql
- database/schema/patch-25-19-0.sql => database/schema/archive/patch-25-19-0.sql
- database/schema/patch-25-20-0.sql => database/schema/archive/patch-25-20-0.sql
- database/schema/patch-25-21-0.sql => database/schema/archive/patch-25-21-0.sql
- database/schema/patch-25-22-0.sql => database/schema/archive/patch-25-22-0.sql
- database/schema/patch-25-23-0.sql => database/schema/archive/patch-25-23-0.sql
- database/schema/patch-25-23-1.sql => database/schema/archive/patch-25-23-1.sql
- database/schema/patch-25-24-0.sql => database/schema/archive/patch-25-24-0.sql
- database/schema/patch-25-25-0.sql => database/schema/archive/patch-25-25-0.sql
- database/schema/patch-25-26-0.sql => database/schema/archive/patch-25-26-0.sql
- database/schema/patch-25-27-0.sql => database/schema/archive/patch-25-27-0.sql
- database/schema/patch-25-27-1.sql => database/schema/archive/patch-25-27-1.sql
- database/schema/patch-25-28-0.sql => database/schema/archive/patch-25-28-0.sql
- database/schema/patch-25-29-0.sql => database/schema/archive/patch-25-29-0.sql
- database/schema/patch-25-30-0.sql => database/schema/archive/patch-25-30-0.sql
- database/schema/patch-25-30-1.sql => database/schema/archive/patch-25-30-1.sql
- database/schema/patch-25-31-0.sql => database/schema/archive/patch-25-31-0.sql
- database/schema/patch-25-32-0.sql => database/schema/archive/patch-25-32-0.sql
- database/schema/patch-25-32-1.sql => database/schema/archive/patch-25-32-1.sql
- database/schema/patch-25-33-0.sql => database/schema/archive/patch-25-33-0.sql
- database/schema/patch-25-34-0.sql => database/schema/archive/patch-25-34-0.sql
- database/schema/patch-25-34-1.sql => database/schema/archive/patch-25-34-1.sql
- database/schema/patch-25-35-0.sql => database/schema/archive/patch-25-35-0.sql
- database/schema/patch-25-36-0.sql => database/schema/archive/patch-25-36-0.sql
- database/schema/patch-25-36-1.sql => database/schema/archive/patch-25-36-1.sql
- database/schema/patch-25-37-0.sql => database/schema/archive/patch-25-37-0.sql
- database/schema/patch-25-39-0.sql => database/schema/archive/patch-25-39-0.sql
- database/schema/patch-25-40-0.sql => database/schema/archive/patch-25-40-0.sql
- database/schema/patch-25-41-0.sql => database/schema/archive/patch-25-41-0.sql
- database/schema/patch-25-42-0.sql => database/schema/archive/patch-25-42-0.sql
- database/schema/patch-25-43-0.sql => database/schema/archive/patch-25-43-0.sql
- database/schema/patch-25-44-0.sql => database/schema/archive/patch-25-44-0.sql
- database/schema/patch-25-45-0.sql => database/schema/archive/patch-25-45-0.sql
- database/schema/patch-25-46-0.sql => database/schema/archive/patch-25-46-0.sql
- database/schema/patch-25-47-0.sql => database/schema/archive/patch-25-47-0.sql
- database/schema/patch-25-48-0.sql => database/schema/archive/patch-25-48-0.sql
- database/schema/patch-25-49-0.sql => database/schema/archive/patch-25-49-0.sql
- database/schema/patch-25-50-0.sql => database/schema/archive/patch-25-50-0.sql
- database/schema/patch-25-50-1.sql => database/schema/archive/patch-25-50-1.sql
- database/schema/patch-25-51-0.sql => database/schema/archive/patch-25-51-0.sql
- database/schema/patch-25-51-1.sql => database/schema/archive/patch-25-51-1.sql
- database/schema/patch-25-52-0.sql => database/schema/archive/patch-25-52-0.sql
- database/schema/patch-25-53-0.sql => database/schema/archive/patch-25-53-0.sql
- database/schema/patch-25-54-0.sql => database/schema/archive/patch-25-54-0.sql
- database/schema/patch-25-55-0.sql => database/schema/archive/patch-25-55-0.sql
- lib/canonical/database/adapter.py => lib/canonical/launchpad/webapp/adapter.py
- lib/canonical/database/ftests/test_adapter.txt => lib/canonical/launchpad/webapp/ftests/test_adapter.txt
- package-includes/launchpad-sql-configure-normal.zcml => package-includes/launchpad-sql-configure.zcml
- files modified:
- database/schema/Makefile
expand all
collapse all
added
removed
