← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/model/codeimport.py

Committer: William Grant
Date: 2011-08-31 05:06:54 UTC
mfrom: (13828 devel)
mto: (7675.1045.758 db-devel)
mto: This revision was merged to the branch mainline in revision 13902.
Revision ID: william.grant@canonical.com-20110831050654-65pd85h8dy1fzp9j

Merge stable r13828, resolving conflicts.

files modified:
lib/devscripts/ec2test/account.py

lib/lp/archivepublisher/__init__.py

lib/lp/archivepublisher/deathrow.py

lib/lp/archivepublisher/domination.py

lib/lp/bugs/browser/bugtask.py

lib/lp/bugs/browser/tests/test_bugtask.py

lib/lp/bugs/model/bug.py

lib/lp/code/browser/codeimport.py

lib/lp/code/interfaces/codeimport.py

lib/lp/code/model/codeimport.py

lib/lp/soyuz/adapters/notification.py

lib/lp/soyuz/adapters/tests/test_notification.py

lib/lp/soyuz/interfaces/archive.py

lib/lp/soyuz/interfaces/sourcepackagerelease.py

lib/lp/soyuz/model/publishing.py

lib/lp/soyuz/model/sourcepackagerelease.py

lib/lp/soyuz/scripts/packagecopier.py

lib/lp/soyuz/scripts/tests/test_copypackage.py

lib/lp/soyuz/tests/test_sourcepackagerelease.py

lib/lp/testing/factory.py

Show diffs side-by-side

added added

removed removed

lib/lp/code/model/codeimport.py

86

86

storm_validator=validate_public_person, notNull=False, default=None)

87

87

88

88

review_status = EnumCol(schema=CodeImportReviewStatus, notNull=True,

89

default=CodeImportReviewStatus.NEW)

89

default=CodeImportReviewStatus.REVIEWED)

90

90

91

91

rcs_type = EnumCol(schema=RevisionControlSystems,

92

92

notNull=False, default=None)

Older »