Merge lp:~mthaddon/charms/trusty/apache-openid/default-provider into lp:~canonical-is-sa/charms/trusty/apache-openid/trunk

Proposed by Tom Haddon
Status: Merged
Merged at revision: 18
Proposed branch: lp:~mthaddon/charms/trusty/apache-openid/default-provider
Merge into: lp:~canonical-is-sa/charms/trusty/apache-openid/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
config.yaml (+1/-1)
To merge this branch: bzr merge lp:~mthaddon/charms/trusty/apache-openid/default-provider
Reviewer Review Type Date Requested Status
Paul Collins Approve
Review via email: mp+278972@code.launchpad.net

Description of the change

Switch default provider to login.ubuntu.com

To post a comment you must log in.
Revision history for this message
Paul Collins (pjdc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.yaml'
--- config.yaml 2014-12-10 13:47:41 +0000
+++ config.yaml 2015-11-30 14:08:18 +0000
@@ -10,7 +10,7 @@
10 allowed_providers:10 allowed_providers:
11 type: string11 type: string
12 description: List of OpenID providers.12 description: List of OpenID providers.
13 default: "Launchpad=login.launchpad.net"13 default: "https://login.ubuntu.com"
14 authorized_teams:14 authorized_teams:
15 type: string15 type: string
16 description: A list of authorized teams, separated by spaces16 description: A list of authorized teams, separated by spaces

Subscribers

People subscribed via source and target branches

to all changes: