Viewing all changes in revision 14550.3.10.
- Committer: Ian Booth
- Date: 2011-12-22 22:20:19 UTC
- mfrom: (14585 devel)
- mto: This revision was merged to the branch mainline in revision 14588.
- Revision ID: ian.booth@canonical.com-20111222222019-ix679hdgjf3wcc1q
Merge from trunk and resolve conflicts
- files added:
- lib/lp/services/authserver
- lib/lp/services/authserver/doc
- lib/lp/services/librarian
- lib/lp/services/librarian/doc
- lib/lp/services/librarian/tests
- lib/lp/services/librarian/tests/data
- lib/lp/services/webservice/doc
- files removed:
- lib/canonical/launchpad/browser
- lib/canonical/launchpad/browser/tests
- lib/canonical/launchpad/database
- lib/canonical/launchpad/database/tests
- lib/canonical/launchpad/interfaces
- lib/canonical/launchpad/pagetests
- lib/canonical/launchpad/rest
- lib/canonical/launchpad/zcml
- files renamed:
- lib/canonical/launchpad/interfaces/_schema_circular_imports.py => lib/lp/_schema_circular_imports.py
- lib/canonical/launchpad/zcml/webservice.zcml => lib/lp/configure.zcml
- lib/canonical/launchpad/interfaces/webservice.py => lib/lp/patchwebservice.py
- lib/canonical/launchpad/doc/ubuntu-releases.testdata => lib/lp/registry/tests/ubuntu-releases.testdata
- lib/canonical/launchpad/doc/xmlrpc-authserver.txt => lib/lp/services/authserver/doc/xmlrpc-authserver.txt
- lib/canonical/launchpad/interfaces/authserver.py => lib/lp/services/authserver/interfaces.py
- lib/canonical/launchpad/xmlrpc/tests/ => lib/lp/services/authserver/tests/
- lib/canonical/launchpad/xmlrpc/authserver.py => lib/lp/services/authserver/xmlrpc.py
- lib/lp/services/apachelogparser/librarian_apache_log_parser.py => lib/lp/services/librarian/apachelogparser.py
- lib/canonical/launchpad/browser/librarian.py => lib/lp/services/librarian/browser.py
- lib/canonical/launchpad/zcml/librarian.zcml => lib/lp/services/librarian/configure.zcml
- lib/canonical/launchpad/doc/librarian.txt => lib/lp/services/librarian/doc/librarian.txt
- lib/canonical/launchpad/interfaces/librarian.py => lib/lp/services/librarian/interfaces.py
- lib/canonical/launchpad/database/librarian.py => lib/lp/services/librarian/model.py
- lib/lp/services/apachelogparser/tests/apache-log-files-for-sampledata/ => lib/lp/services/librarian/tests/data/apache-log-files-for-sampledata/
- lib/lp/services/apachelogparser/tests/test_librarian_apache_log_parser.py => lib/lp/services/librarian/tests/test_apachelogparser.py
- lib/canonical/launchpad/ftests/test_libraryfilealias.py => lib/lp/services/librarian/tests/test_libraryfilealias.py
- lib/canonical/launchpad/tests/test_libraryfilealias_with_parent.py => lib/lp/services/librarian/tests/test_libraryfilealias_with_parent.py
- lib/canonical/launchpad/browser/tests/test_libraryfilealiasview.py => lib/lp/services/librarian/tests/test_libraryfilealiasview.py
- lib/canonical/launchpad/database/tests/test_timelimitedtoken.py => lib/lp/services/librarian/tests/test_timelimitedtoken.py
- lib/canonical/launchpad/rest/bytestorage.py => lib/lp/services/webservice/bytestorage.py
- lib/canonical/launchpad/rest/configuration.py => lib/lp/services/webservice/configuration.py
- lib/canonical/launchpad/doc/launchpadlib.txt => lib/lp/services/webservice/doc/launchpadlib.txt
- lib/canonical/launchpad/doc/webservice-configuration.txt => lib/lp/services/webservice/doc/webservice-configuration.txt
- lib/canonical/launchpad/doc/webservice-error.txt => lib/lp/services/webservice/doc/webservice-error.txt
- lib/canonical/launchpad/doc/webservice-marshallers.txt => lib/lp/services/webservice/doc/webservice-marshallers.txt
- lib/canonical/launchpad/rest/me.py => lib/lp/services/webservice/me.py
- lib/canonical/launchpad/rest/pillarset.py => lib/lp/services/webservice/pillarset.py
- lib/canonical/launchpad/pagetests/webservice/ => lib/lp/services/webservice/stories/
- lib/canonical/launchpad/tests/test_launchpadlib.py => lib/lp/services/webservice/tests/test_launchpadlib.py
- lib/canonical/launchpad/ftests/test_wadl_generation.py => lib/lp/services/webservice/tests/test_wadl_generation.py
- lib/canonical/launchpad/ftests/test_wadllib.py => lib/lp/services/webservice/tests/test_wadllib.py
- lib/canonical/launchpad/rest/wadl.py => lib/lp/services/webservice/wadl.py
- files modified:
- buildout-templates/bin/retest.in
expand all
collapse all
added
removed
