lp:~brad-marshall/charms/trusty/ntp/add-auto-peers

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charms/trusty/ntp at revision 19

Charles Butler (community): Approve on 2015-04-16

Adam Israel (community): Approve on 2015-04-01

Whit Morriss (community): Needs Fixing on 2015-03-31

Cory Johns (community): Needs Fixing on 2015-03-25

Marco Ceppi (community): Needs Fixing on 2015-03-24

Diff: 265 lines (+89/-19)

6 files modified

README.md (+12/-3)
config.yaml (+13/-1)
hooks/ntp_hooks.py (+33/-3)
metadata.yaml (+3/-0)
templates/ntp.conf (+5/-0)
tests/10-deploy-test.py (+23/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

37. By Brad Marshall on 2015-04-01

[bradm] Fixed unit name on the test

Merged branch lp:~whitmo/charms/trusty/ntp/test-fix

36. By Brad Marshall on 2015-03-31

[bradm] Merge in nrpe fixes

35. By Brad Marshall on 2015-03-27

[bradm] Remove the total_source line

34. By Brad Marshall on 2015-03-27

[bradm] Tidied up extra unneeded lines.

33. By Brad Marshall on 2015-03-27

[bradm] Deploy ntp subordinate before adding relation to ntpmaster, clean up debugging lines

32. By Brad Marshall on 2015-03-27

[bradm] Apply the timeout to the sentry

31. By Brad Marshall on 2015-03-27

[bradm] Add missing type to nagios_servicegroups

30. By Brad Marshall on 2015-03-27

[bradm] Fixed nagios_servicegroup setting

29. By Brad Marshall on 2015-03-27

[bradm] Added default empty string to nagios_servicegroup, unit tests for peers

28. By Brad Marshall on 2015-03-24

[bradm] Fixed conflicts with upstream