← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 7675.467.4.

Committer: Jonathan Lange
Date: 2010-01-15 02:19:42 UTC
mfrom: (10130.7.34 builder-behavior)
mto: (10130.11.1)
mto: This revision was merged to the branch mainline in revision 10225.
Revision ID: jml@canonical.com-20100115021942-jinhmd0fmr4r5lpg

Merge jelmer's branch, resolving conflicts.

files modified:
lib/lp/archiveuploader/permission.py

lib/lp/registry/tests/test_distroseries.py

lib/lp/soyuz/adapters/archivedependencies.py

lib/lp/soyuz/doc/archive-dependencies.txt

lib/lp/soyuz/interfaces/sourcepackagerecipe.py

lib/lp/soyuz/interfaces/sourcepackagerecipebuild.py

lib/lp/soyuz/model/binarypackagebuildbehavior.py

lib/lp/soyuz/model/recipebuilder.py

lib/lp/soyuz/model/sourcepackagerecipebuild.py

lib/lp/soyuz/tests/test_recipebuilder.py

Show diffs side-by-side

added added

removed removed

lib/lp/archiveuploader/permission.py

lib/lp/registry/tests/test_distroseries.py

lib/lp/soyuz/adapters/archivedependencies.py

lib/lp/soyuz/doc/archive-dependencies.txt

lib/lp/soyuz/interfaces/sourcepackagerecipe.py

lib/lp/soyuz/interfaces/sourcepackagerecipebuild.py

lib/lp/soyuz/model/binarypackagebuildbehavior.py

lib/lp/soyuz/model/recipebuilder.py

lib/lp/soyuz/model/sourcepackagerecipebuild.py

lib/lp/soyuz/tests/test_recipebuilder.py

Older »