Merge lp://staging/~paulgear/charms/trusty/ntp/sync-canonical-is-charms into lp://staging/charms/trusty/ntp
Proposed by
Paul Gear
Status: | Merged |
---|---|
Merged at revision: | 25 |
Proposed branch: | lp://staging/~paulgear/charms/trusty/ntp/sync-canonical-is-charms |
Merge into: | lp://staging/charms/trusty/ntp |
Diff against target: |
179 lines (+62/-38) 3 files modified
config.yaml (+6/-5) hooks/ntp_hooks.py (+53/-30) templates/ntp.conf (+3/-3) |
To merge this branch: | bzr merge lp://staging/~paulgear/charms/trusty/ntp/sync-canonical-is-charms |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stuart Bishop (community) | Approve | ||
Review Queue (community) | automated testing | Needs Fixing | |
Review via email: mp+276951@code.staging.launchpad.net |
Description of the change
This has the following features/fixes:
- The use_iburst and auto_peers config options are now true by default. In environments which perform outbound UDP rate-limiting, it is recommended to change this to false.
- If all Nagios checks are enabled, they are merged into a single check, reducing noise and increasing efficiency.
- Should fix https:/
This eliminates the differences in canonical-is-charms and will allow us to use the trunk charm.
To post a comment you must log in.
This item has failed automated testing! Results available here http:// juju-ci. vapour. ws:8080/ job/charm- bundle- test-lxc/ 1392/