Merge ~barryprice/charm-k8s-mattermost/+git/charm-k8s-mattermost:master into charm-k8s-mattermost:master

Proposed by Barry Price
Status: Merged
Approved by: Barry Price
Approved revision: 369ccb6fac3998056d08d2dba571550772695eee
Merged at revision: 469041de2caba749c20c4d1a848fac35746f1748
Proposed branch: ~barryprice/charm-k8s-mattermost/+git/charm-k8s-mattermost:master
Merge into: charm-k8s-mattermost:master
Diff against target: 10 lines (+1/-1)
1 file modified
config.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email:

Commit message

Use the built-in Mattermost SAML library by default to match upstream v5.29.1 and later

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Haw Loeung (hloeung) wrote :


review: Approve (+1)
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 469041de2caba749c20c4d1a848fac35746f1748

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config.yaml b/config.yaml
2index 6279382..606a783 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -192,4 +192,4 @@ options:
6 type: boolean
7 description: |
8 If set, use the built-in Mattermost SAML library. Otherwise, use xmlsec1 to verify logins.
9- default: false
10+ default: true


People subscribed via source and target branches