PostgreSQL Charm

Merge ~barryprice/postgresql-charm/+git/postgresql-charm:master into postgresql-charm:master

  1. Git
  2. lp:~barryprice/postgresql-charm/+git/postgresql-charm
  3. master
  4. Merge into master
Proposed by Barry Price
Status: Merged
Approved by: Barry Price
Approved revision: 6603a5e9d28c38d9926376819a601849ac3f8bd4
Merged at revision: e55c7ffd8d8d1487e8264ba4cd55b8802eafb55d
Proposed branch: ~barryprice/postgresql-charm/+git/postgresql-charm:master
Merge into: postgresql-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
reactive/postgresql/nagios.py (+1/-1)
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+363829@code.launchpad.net

Commit message

Fixes for the previous

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
Stuart Bishop (stub) wrote :

Yup

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

Change successfully merged at revision e55c7ffd8d8d1487e8264ba4cd55b8802eafb55d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/postgresql/nagios.py b/reactive/postgresql/nagios.py
2index 415e687..956cfc9 100644
3--- a/reactive/postgresql/nagios.py
4+++ b/reactive/postgresql/nagios.py
5@@ -17,7 +17,7 @@
6 import os.path
7
8 from charmhelpers.contrib.charmsupport.nrpe import NRPE
9-from charmhelpers.core import host
10+from charmhelpers.core import hookenv, host
11
12 from charms import leadership, reactive
13 from charms.reactive import hook, only_once, when, when_any, when_not

Subscribers

People subscribed via source and target branches

to all changes: