Merge ~alephnull-b/charm-thruk-master:bionic-support into ~nagios-charmers/charm-thruk-master:master

Proposed by Alok G Singh
Status: Merged
Approved by: Alok G Singh
Approved revision: 4c80b7d3c1d8e2729958ebac9c64356854dcfcff
Merged at revision: 4c80b7d3c1d8e2729958ebac9c64356854dcfcff
Proposed branch: ~alephnull-b/charm-thruk-master:bionic-support
Merge into: ~nagios-charmers/charm-thruk-master:master
Diff against target: 27 lines (+2/-1)
2 files modified
hooks/services.py (+1/-1)
metadata.yaml (+1/-0)
Reviewer Review Type Date Requested Status
Chris Sanders (community) Approve
Andrea Ieri Needs Fixing
Review via email: mp+362027@code.launchpad.net

Description of the change

Tested bionic support.
Fixes lp#1805101

To post a comment you must log in.
Revision history for this message
Andrea Ieri (aieri) wrote :

looks good, but I think it'd be cleaner to have two separate commits, as the issues fixed are conceptually separate

review: Needs Fixing
Revision history for this message
Chris Sanders (chris.sanders) wrote :

> looks good, but I think it'd be cleaner to have two separate commits, as the
> issues fixed are conceptually separate

While I agree in concept, two lines of change splitting into two one line changes seems a bit much IMO.

review: Approve
Revision history for this message
Chris Sanders (chris.sanders) wrote :

> > looks good, but I think it'd be cleaner to have two separate commits, as the
> > issues fixed are conceptually separate
>
> While I agree in concept, two lines of change splitting into two one line
> changes seems a bit much IMO.

Oh and if a bug is closed it should be linked to the review so it updates when accepted and merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/hooks/services.py b/hooks/services.py
0old mode 1006440old mode 100644
1new mode 1007551new mode 100755
index 959f668..e661f7e
--- a/hooks/services.py
+++ b/hooks/services.py
@@ -12,7 +12,7 @@ def manage():
12 config = hookenv.config()12 config = hookenv.config()
13 manager = ServiceManager([13 manager = ServiceManager([
14 {14 {
15 'service': 'thruk-master',15 'service': 'thruk',
16 'ports': [80, 443], # ports to after start16 'ports': [80, 443], # ports to after start
17 # 'provided_data': [17 # 'provided_data': [
18 # # context managers for provided relations18 # # context managers for provided relations
diff --git a/metadata.yaml b/metadata.yaml
index 376b35a..df97618 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -8,6 +8,7 @@ tags:
8series:8series:
9 - trusty9 - trusty
10 - xenial10 - xenial
11 - bionic
11subordinate: false12subordinate: false
12provides:13provides:
13 website:14 website:

Subscribers

People subscribed via source and target branches