Canonical SSO provider

Merge lp://qastaging/~jml/canonical-identity-provider/trivial-good into lp://qastaging/canonical-identity-provider/release

trivial-good
Merge into trunk

Proposed by Jonathan Lange on 2012-12-17

Status:	Merged
Approved by:	Natalia Bidart on 2013-01-02
Approved revision:	no longer in the source branch.
Merged at revision:	578
Proposed branch:	lp://qastaging/~jml/canonical-identity-provider/trivial-good
Merge into:	lp://qastaging/canonical-identity-provider/release
Diff against target:	9 lines (+1/-1) 1 file modified README (+1/-1)
To merge this branch:	bzr merge lp://qastaging/~jml/canonical-identity-provider/trivial-good
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jonathan Lange (community)			Approve on 2012-12-17
Review via email: mp+140270@code.qastaging.launchpad.net

Commit message

Trivial update to README

Description of the change

Trivial update to README to exercise jenkins.

Revision history for this message

Jonathan Lange (jml) wrote on 2012-12-17:

Rubberstamp! Proposer approves of own proposal.

review: Approve

Revision history for this message

Ubuntu One Server Tarmac Bot (ubuntuone-server-tarmac) wrote on 2012-12-17:

The attempt to merge lp:~jml/canonical-identity-provider/trivial-good into lp:canonical-identity-provider failed. Below is the output from the failed tests.

WARNING:root:File /mnt/tarmac/cache/canonical-identity-provider/trunk/django_project/../../../local_config/local.cfg could not be read. Skipping.
WARNING:root:File /mnt/tarmac/cache/canonical-identity-provider/trunk/django_project/config/config/devel.cfg could not be read. Skipping.
dropdb: could not connect to database postgres: FATAL: Peer authentication failed for user "postgres"

Warning: local() encountered an error (return code 1) while executing ' /usr/lib/postgresql/9.1/bin/dropdb -U postgres identityprovider'

createdb: could not connect to database postgres: FATAL: Peer authentication failed for user "postgres"

Fatal error: local() encountered an error (return code 1) while executing ' /usr/lib/postgresql/9.1/bin/createdb -U postgres -O postgres identityprovider'

Aborting.