Viewing all changes in revision 9176.
- Committer: Henning Eggers
- Date: 2010-11-03 22:07:30 UTC
- mfrom: (9124.4.817 launchpad)
- Revision ID: henning@canonical.com-20101103220730-c341srlmgifp17hp
Merged db-stable into recife, resolving conflicts.
- files added:
- bzrplugins/lpserve
- lib/lp/scripts/tests
- files removed:
- lib/canonical/launchpad/ftests/harness.py
- files renamed:
- bzrplugins/lpserve.py => bzrplugins/lpserve/__init__.py
- lib/lp/bugs/tests/test_bugtask_status.txt => lib/lp/bugs/doc/bugtask-status-changes.txt
- lib/lp/bugs/tests/test_bugtask.py => lib/lp/bugs/model/tests/test_bugtask.py
- lib/lp/bugs/tests/test_bugtask_status.py => lib/lp/bugs/model/tests/test_bugtask_status.py
- lib/lp/registry/doc/project.txt => lib/lp/registry/doc/projectgroup.txt
- lib/canonical/launchpad/scripts/garbo.py => lib/lp/scripts/garbo.py
- lib/canonical/launchpad/scripts/tests/test_garbo.py => lib/lp/scripts/tests/test_garbo.py
- files modified:
- .bzrignore
expand all
collapse all
added
removed
