← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 14104.6.3.

Committer: Robert Collins
Date: 2011-10-16 19:13:13 UTC
mfrom: (14104.5.9 use-oops-twisted)
mto: This revision was merged to the branch mainline in revision 14213.
Revision ID: robertc@robertcollins.net-20111016191313-g3fpjgr2fg1yyjeu

Merge use-oops-twisted to resolve conflicts.

files modified:
lib/canonical/launchpad/webapp/errorlog.py

lib/lp/codehosting/codeimport/workermonitor.py

lib/lp/hardwaredb/tests/test_hwdb_submission_validation.py

lib/lp/services/sshserver/service.py

lib/lp/services/twistedsupport/loggingsupport.py

lib/lp/services/twistedsupport/tests/test_loggingsupport.py

scripts/code-import-worker-monitor.py

setup.py

versions.cfg

Show diffs side-by-side

added added

removed removed

lib/canonical/launchpad/webapp/errorlog.py

lib/lp/codehosting/codeimport/workermonitor.py

lib/lp/hardwaredb/tests/test_hwdb_submission_validation.py

lib/lp/services/sshserver/service.py

lib/lp/services/twistedsupport/loggingsupport.py

lib/lp/services/twistedsupport/tests/test_loggingsupport.py

scripts/code-import-worker-monitor.py

Older »