← Back to branch summary

~canonical-isd-hackers/canonical-identity-provider/sst-changes

~canonical-isd-hackers/canonical-identity-provider/sst-changes

Viewing all changes in revision 140.

Committer: Ricardo Kirkner
Date: 2011-03-14 19:17:40 UTC
mfrom: (79.2.17 2.x-stable)
Revision ID: ricardo.kirkner@canonical.com-20110314191740-5xzhmvpfwwlinu4a

merged stable branch for 11.03 release back into trunk

files modified:
doctests/stories/api-workflows.txt

identityprovider/bin/accounts_merge.py

identityprovider/models/account.py

identityprovider/tests/test_webservice.py

identityprovider/webservice/forms.py

identityprovider/webservice/interfaces.py

identityprovider/webservice/models.py

mockservice/api-workflows.txt

mockservice/sso_mockserver/mockserver.py

mockservice/sso_mockserver/wadl.xml

scripts/merge-accounts *

wsgiserver.py

Show diffs side-by-side

added added

removed removed

doctests/stories/api-workflows.txt

identityprovider/bin/accounts_merge.py

identityprovider/models/account.py

identityprovider/tests/test_webservice.py

identityprovider/webservice/forms.py

identityprovider/webservice/interfaces.py

identityprovider/webservice/models.py

mockservice/api-workflows.txt

mockservice/sso_mockserver/mockserver.py

mockservice/sso_mockserver/wadl.xml

Older »