charm-k8s-wordpress

Merge ~tcuthbert/charm-k8s-wordpress:master into charm-k8s-wordpress:master

  1. Git
  2. lp:~tcuthbert/charm-k8s-wordpress
  3. master
  4. Merge into master
Proposed by Thomas Cuthbert
Status: Merged
Approved by: Tom Haddon
Approved revision: da4ed0b89643653d183280cbfab15a0b3f7e53a3
Merged at revision: 345fb33f408ab36cd39f8684ddc775ec67bc2f58
Proposed branch: ~tcuthbert/charm-k8s-wordpress:master
Merge into: charm-k8s-wordpress:master
Diff against target: 10 lines (+1/-1)
1 file modified
src/charm.py (+1/-1)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+394229@code.launchpad.net

Commit message

Fix bug in charm entrypoint

To post a comment you must log in.
Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 345fb33f408ab36cd39f8684ddc775ec67bc2f58

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/charm.py b/src/charm.py
2index 2360239..edade47 100755
3--- a/src/charm.py
4+++ b/src/charm.py
5@@ -289,4 +289,4 @@ class WordpressCharm(CharmBase):
6
7
8 if __name__ == "__main__":
9- main(WordpressK8sCharm)
10+ main(WordpressCharm)

Subscribers

People subscribed via source and target branches