← Back to branch summary

~allenap/python-oops-tools/use-psycopg2-2.4.1

~allenap/python-oops-tools/use-psycopg2-2.4.1

Viewing all changes in revision 21.

Committer: Gavin Panella
Date: 2011-11-30 17:06:23 UTC
mfrom: (19.2.4 python-oops-tools)
Revision ID: gavin.panella@canonical.com-20111130170623-c0vd26cwtbopo06y

Merge trunk, resolving 1 conflict.

files added:
src/oopstools/oops/migrations/0020_add_oops_prune.py

src/oopstools/oops/migrations/0021_longer_reporter.py

src/oopstools/scripts/prune.py

files modified:
.bzrignore

setup.py

src/oopstools/NEWS.txt

src/oopstools/oops/models.py

src/oopstools/oops/test/test_dboopsloader.py

src/oopstools/scripts/amqp2disk.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/oopstools/NEWS.txt

src/oopstools/oops/migrations/0020_add_oops_prune.py

src/oopstools/oops/migrations/0021_longer_reporter.py

src/oopstools/oops/models.py

src/oopstools/oops/test/test_dboopsloader.py

src/oopstools/scripts/amqp2disk.py

src/oopstools/scripts/prune.py

Older »