← Back to branch summary

~launchpad-pqm/launchpad/devel

~launchpad-pqm/launchpad/devel

Viewing all changes in revision 14565.2.24.

Committer: Curtis Hovey
Date: 2011-12-22 04:43:36 UTC
mfrom: (14575 devel)
mto: This revision was merged to the branch mainline in revision 14576.
Revision ID: curtis.hovey@canonical.com-20111222044336-9trc459wva8vvlzo

Merged devel and resolved conlicts.

files modified:
cronscripts/publishing/maintenance-check.py

cronscripts/supermirror-pull.py

lib/canonical/launchpad/rest/configuration.py

lib/canonical/launchpad/rest/pillarset.py

lib/canonical/launchpad/testing/fakepackager.py

lib/canonical/launchpad/testing/pages.py

lib/canonical/launchpad/testing/systemdocs.py

lib/canonical/launchpad/webapp/adapter.py

lib/canonical/launchpad/webapp/doc/canonical_url_examples.txt

lib/canonical/launchpad/webapp/doc/webapp-authorization.txt

lib/canonical/launchpad/webapp/launchbag.py

lib/canonical/launchpad/webapp/login.py

lib/canonical/launchpad/webapp/publication.py

lib/canonical/launchpad/webapp/tests/test_authorization.py

lib/canonical/launchpad/webapp/tests/test_login.py

lib/canonical/launchpad/webapp/tests/test_pgsession.py

lib/canonical/launchpad/xmlrpc/application.py

lib/devscripts/ec2test/builtins.py

lib/devscripts/ec2test/credentials.py

lib/devscripts/ec2test/instance.py

lib/devscripts/ec2test/testrunner.py

lib/lp/answers/tests/test_question_webservice.py

lib/lp/app/browser/tests/test_stringformatter.py

lib/lp/app/doc/badges.txt

lib/lp/app/doc/batch-navigation.txt

lib/lp/app/doc/object-privacy.txt

lib/lp/app/javascript/formwidgets/resizing_textarea.js

lib/lp/app/javascript/inlineedit/assets/editor-core.css

lib/lp/app/javascript/inlineedit/editor.js

lib/lp/app/javascript/inlineedit/tests/test_inline_edit.js

lib/lp/app/javascript/picker/picker_patcher.js

lib/lp/app/stories/basics/demo-and-lpnet.txt

lib/lp/app/templates/base-layout-macros.pt

lib/lp/app/templates/launchpad-loginstatus.pt

lib/lp/app/tests/test_validation.py

lib/lp/app/validators/tests/validation.txt

lib/lp/app/widgets/doc/location-widget.txt

lib/lp/app/widgets/exception.py

lib/lp/app/widgets/owner.py

lib/lp/app/widgets/password.py

lib/lp/archivepublisher/tests/publisher-config.txt

lib/lp/archivepublisher/tests/test_publisherconfig.py

lib/lp/archiveuploader/dscfile.py

lib/lp/archiveuploader/tests/nascentuploadfile.txt

lib/lp/archiveuploader/tests/test_buildduploads.py

lib/lp/archiveuploader/tests/test_changesfile.py

lib/lp/archiveuploader/tests/test_dscfile.py

Show diffs side-by-side

added added

removed removed

cronscripts/publishing/maintenance-check.py

cronscripts/supermirror-pull.py

lib/canonical/launchpad/rest/configuration.py

lib/canonical/launchpad/rest/pillarset.py

lib/canonical/launchpad/testing/fakepackager.py

lib/canonical/launchpad/testing/pages.py

lib/canonical/launchpad/testing/systemdocs.py

lib/canonical/launchpad/webapp/adapter.py

lib/canonical/launchpad/webapp/doc/canonical_url_examples.txt

lib/canonical/launchpad/webapp/doc/webapp-authorization.txt

lib/canonical/launchpad/webapp/launchbag.py

lib/canonical/launchpad/webapp/publication.py

lib/canonical/launchpad/webapp/tests/test_authorization.py

lib/canonical/launchpad/webapp/tests/test_login.py

lib/canonical/launchpad/webapp/tests/test_pgsession.py

lib/canonical/launchpad/xmlrpc/application.py

lib/devscripts/ec2test/builtins.py

lib/devscripts/ec2test/credentials.py

lib/devscripts/ec2test/instance.py

lib/devscripts/ec2test/testrunner.py

lib/lp/answers/tests/test_question_webservice.py

lib/lp/app/browser/tests/test_stringformatter.py

lib/lp/app/doc/badges.txt

lib/lp/app/doc/object-privacy.txt

lib/lp/app/javascript/formwidgets/resizing_textarea.js

lib/lp/app/javascript/inlineedit/assets/editor-core.css

lib/lp/app/javascript/inlineedit/editor.js

lib/lp/app/javascript/inlineedit/tests/test_inline_edit.js

lib/lp/app/javascript/picker/picker_patcher.js

lib/lp/app/stories/basics/demo-and-lpnet.txt

lib/lp/app/templates/base-layout-macros.pt

lib/lp/app/templates/launchpad-loginstatus.pt

lib/lp/app/tests/test_validation.py

lib/lp/app/validators/tests/validation.txt

lib/lp/app/widgets/exception.py

lib/lp/app/widgets/owner.py

lib/lp/app/widgets/password.py

lib/lp/archivepublisher/tests/publisher-config.txt

lib/lp/archivepublisher/tests/test_publisherconfig.py

lib/lp/archiveuploader/dscfile.py

lib/lp/archiveuploader/tests/nascentuploadfile.txt

lib/lp/archiveuploader/tests/test_buildduploads.py

lib/lp/archiveuploader/tests/test_changesfile.py

lib/lp/archiveuploader/tests/test_dscfile.py

Older »