Merge ~barryprice/apache-openid-charm/+git/apache-openid-charm:master into apache-openid-charm:master

Proposed by Barry Price
Status: Merged
Approved by: Laurent Sesquès
Approved revision: 10ba9de52c4f776e3266e2d73ec2470fe71b123e
Merged at revision: 36f8e358725f312445cc86351ce20345e4f52186
Proposed branch: ~barryprice/apache-openid-charm/+git/apache-openid-charm:master
Merge into: apache-openid-charm:master
Diff against target: 24 lines (+2/-2)
2 files modified
copyright (+1/-1)
metadata.yaml (+1/-1)
Reviewer Review Type Date Requested Status
Laurent Sesquès Approve
Canonical IS Reviewers Pending
Review via email: mp+405440@code.launchpad.net

Commit message

Update maintainer, copyright

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

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

Revision history for this message
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 36f8e358725f312445cc86351ce20345e4f52186

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/copyright b/copyright
index 5afe79e..70535ea 100644
--- a/copyright
+++ b/copyright
@@ -1,7 +1,7 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
22
3Files: *3Files: *
4Copyright: Copyright 2013, Canonical Ltd., All Rights Reserved.4Copyright: Copyright 2013-2021, Canonical Ltd., All Rights Reserved.
5License: GPL-35License: GPL-3
6 This program is free software: you can redistribute it and/or modify6 This program is free software: you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by7 it under the terms of the GNU General Public License as published by
diff --git a/metadata.yaml b/metadata.yaml
index 94f9eac..8bfc4df 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,5 +1,5 @@
1name: apache-openid1name: apache-openid
2maintainer: Caio Begotti <caio.begotti@canonical.com>2maintainer: Apache OpenID Charmers <https://launchpad.net/~apache-openid-charmers>
3summary: Enables OpenID on Apache web servers3summary: Enables OpenID on Apache web servers
4tags: ["app-servers"]4tags: ["app-servers"]
5subordinate: true5subordinate: true

Subscribers

People subscribed via source and target branches