Viewing all changes in revision 5863.9.5.
- Committer: Curtis Hovey
- Date: 2008-03-17 16:15:15 UTC
- mfrom: (5899 launchpad)
- mto: (5911.2.2 restricted-librarian) (5883.1.7 gina)
- mto: This revision was merged to the branch mainline in revision 5937.
- Revision ID: curtis.hovey@canonical.com-20080317161515-pvnq7x7w50qifzud
Merge from RF. Resolved schema conflict.
- files added:
- database/schema/patch-121-17-0.sql
- lib/canonical/launchpad/components/externalbugtracker
- lib/canonical/launchpad/pagetests/oauth
- files removed:
- lib/canonical/authserver/client/proxy.py
- files renamed:
- database-frozen.txt => database-not-frozen.txt
- lib/canonical/launchpad/components/externalbugtracker.py => lib/canonical/launchpad/components/externalbugtracker/base.py
- lib/canonical/launchpad/pagetests/specs/ => lib/canonical/launchpad/pagetests/blueprints/
- lib/canonical/launchpad/pagetests/mentoring/01-mentorship.txt => lib/canonical/launchpad/pagetests/mentoring/xx-mentoring.txt
- files modified:
- bzrplugins/lpserve.py
expand all
collapse all
added
removed
