Juju Charms Collection
ntpmaster package

Merge lp:~paulgear/charms/trusty/ntpmaster/trunk into lp:charms/trusty/ntpmaster

  1. Trusty Tahr (14.04)
  2. trunk
  3. Merge into trunk
Proposed by Paul Gear
Status: Merged
Approved by: Stuart Bishop
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~paulgear/charms/trusty/ntpmaster/trunk
Merge into: lp:charms/trusty/ntpmaster
Diff against target: 9 lines (+1/-1)
1 file modified
config.yaml (+1/-1)
To merge this branch: bzr merge lp:~paulgear/charms/trusty/ntpmaster/trunk
Reviewer Review Type Date Requested Status
Stuart Bishop (community) Approve
Review via email: mp+305557@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Yup, iz good.

review: Approve
Revision history for this message
Stuart Bishop (stub) wrote :

Landed, but I still need to do the paperwork to get this into the charm store.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'config.yaml'
2--- config.yaml 2016-07-31 23:50:42 +0000
3+++ config.yaml 2016-09-13 05:35:47 +0000
4@@ -6,4 +6,4 @@
5 source:
6 type: string
7 description: Space separated list of NTP servers and options to use as source for time. Use LOCAL if the machine has no references but itself.
8- default: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org"
9+ default: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org"

Subscribers

People subscribed via source and target branches

to all changes: