Canonical SSO provider

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

  1. trivial-good
  2. Merge into trunk
Proposed by Jonathan Lange
Status: Merged
Approved by: Natalia Bidart
Approved revision: no longer in the source branch.
Merged at revision: 578
Proposed branch: lp:~jml/canonical-identity-provider/trivial-good
Merge into: lp:canonical-identity-provider/release
Diff against target: 9 lines (+1/-1)
1 file modified
README (+1/-1)
To merge this branch: bzr merge lp:~jml/canonical-identity-provider/trivial-good
Reviewer Review Type Date Requested Status
Jonathan Lange (community) Approve
Review via email: mp+140270@code.launchpad.net

Commit message

Trivial update to README

Description of the change

Trivial update to README to exercise jenkins.

To post a comment you must log in.
Revision history for this message
Jonathan Lange (jml) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve
Revision history for this message
Ubuntu One Server Tarmac Bot (ubuntuone-server-tarmac) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2012-12-12 13:49:34 +0000
3+++ README 2012-12-17 18:13:45 +0000
4@@ -227,4 +227,4 @@
5 Enjoy!
6 ------
7
8-We hope you really enjoy using this software.
9+We hope you enjoy using this software.