Mojo: Continuous Delivery for Juju

Merge lp:~paulgear/mojo/mojo-specs into lp:mojo/mojo-specs

  1. mojo-specs
  2. Merge into mojo-specs
Proposed by Paul Gear
Status: Merged
Approved by: Paul Collins
Approved revision: no longer in the source branch.
Merged at revision: 112
Proposed branch: lp:~paulgear/mojo/mojo-specs
Merge into: lp:mojo/mojo-specs
Diff against target: 18 lines (+5/-3)
1 file modified
charm-testing/ntp/deploy (+5/-3)
To merge this branch: bzr merge lp:~paulgear/mojo/mojo-specs
Reviewer Review Type Date Requested Status
Paul Collins lgtm Approve
Review via email: mp+349106@code.launchpad.net

Commit message

Test fix for nrpe config

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
Paul Collins (pjdc) :
review: Approve (lgtm)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 112

lp:~paulgear/mojo/mojo-specs updated
112. By Paul Gear

Test fix for nrpe config

Reviewed-on: https://code.launchpad.net/~paulgear/mojo/mojo-specs/+merge/349106
Reviewed-by: Paul Collins <email address hidden>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/ntp/deploy'
2--- charm-testing/ntp/deploy 2018-07-09 03:06:25 +0000
3+++ charm-testing/ntp/deploy 2018-07-09 03:44:17 +0000
4@@ -6,9 +6,11 @@
5 num_units: 5
6 nrpe:
7 charm: nrpe
8- {% if series == "xenial" %}options:
9- procs: '-w 200 -c 250'
10- swap: '-w 90% -c 75% -n ok'{% endif %}
11+{% if series != "trusty" -%}
12+ options:
13+ procs: '-w 200 -c 250 -k'
14+ swap: '-w 90% -c 75% -n ok'
15+{% endif -%}
16 ntp:
17 charm: ntp
18 options:

Subscribers

People subscribed via source and target branches

to all changes: