~paulgear/ntp-charm/+git/ntp-charm:master

Branch merges

Propose for merging

Merged into ntp-charm:master at revision 2b67f2611d73a2abf46aa4e997ab436a6c9a7e51

NTP charm developers: Pending requested 2019-03-11

Diff: 22 lines (+4/-0)

1 file modified

config.yaml (+4/-0)

api

Merged into ntp-charm:master at revision 2e545ac6f8135956ec32fd2fe4c87e064a0cf30b

Stuart Bishop (community): Approve on 2019-02-11

Canonical IS Reviewers: Pending requested 2019-02-11

Diff: 442 lines (+357/-3)

6 files modified

Makefile (+3/-3)
actions.yaml (+9/-0)
actions/diagnostics (+1/-0)
actions/diagnostics.py (+130/-0)
lib/ntp_implementation.py (+20/-0)
unit_tests/test_action_diagnostics.py (+194/-0)

api

Merged into ntp-charm:master at revision 295ff7ddbaa4cca2bfe5ec73ed8a10b196458c03

NTP charm developers: Pending requested 2017-11-21

Diff: 12 lines (+1/-0)

1 file modified

metadata.yaml (+1/-0)

api

Merged into ntp-charm:master at revision b6cf82268f08a744bb58a25f404d7b5c247d5ab7

Barry Price: Approve on 2017-02-14

Paul Collins: Approve (lgtm) on 2017-02-14

Diff: 307 lines (+99/-31)

2 files modified

files/nagios/check_ntpmon.py (+55/-28)
unit_tests/test_check_ntpmon.py (+44/-3)

api

Superseded for merging into ntp-charm:master

NTP charm developers: Pending requested 2017-02-13

Diff: 307 lines (+99/-31)

2 files modified

files/nagios/check_ntpmon.py (+55/-28)
unit_tests/test_check_ntpmon.py (+44/-3)

api

Merged into ntp-charm:master at revision 25a55e92bb0bcfbc747ecff10ca48f4c58e4c3f9

Haw Loeung: Approve on 2016-12-30

Diff: 227 lines (+63/-34)

4 files modified

README.md (+32/-11)
config.yaml (+14/-2)
hooks/ntp_hooks.py (+14/-21)
templates/ntp.conf (+3/-0)

api

Merged into ntp-charm:master at revision cf1d9a1396b083db9838a6b8eaca1dc623558459

James Page: Approve on 2016-12-08

Stuart Bishop (community): Approve on 2016-12-08

Diff: 25 lines (+2/-1)

1 file modified

hooks/ntp_hooks.py (+2/-1)

api

Merged into ntp-charm:master at revision 42b8d9a0d429d26bed514108cc93bcf33f78222c

Barry Price: Approve on 2016-12-07

Diff: 49 lines (+3/-7)

3 files modified

config.yaml (+0/-3)
metadata.yaml (+2/-3)
templates/ntp.conf (+1/-1)

api

Merged into ntp-charm:master at revision 084266b4f0c7b59b70b9c36c7a55b0ffcb2aca9b

Stuart Bishop (community): Approve on 2016-11-28

Diff: 35 lines (+7/-1)

3 files modified

hooks/ntpmaster-relation-joined (+1/-0)
metadata.yaml (+3/-0)
templates/ntp.conf (+3/-1)

api

Merged into ntp-charm:master at revision e000a1dd2a2b8d5f044a51a273a36f54d14ae874

Stuart Bishop (community): Approve on 2016-11-21

Diff: 12 lines (+1/-0)

1 file modified

hooks/ntp_hooks.py (+1/-0)

api

Merged into ntp-charm:master at revision c3b87f0fc81b9d889a2c4f399ccd8d8fed5d4b1a

Junien F: Approve on 2016-11-17

Stuart Bishop (community): Approve on 2016-11-17

Diff: 74 lines (+16/-7)

2 files modified

config.yaml (+14/-6)
templates/ntp.conf (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

f370286... by Paul Gear on 2019-03-11

Deprecate auto_peers due to performance limitations

See lp:1746134 for details

2e545ac... by Paul Gear on 2019-02-11

Add action for gathering diagnostics lp:1802833

Reviewed-on: https://code.launchpad.net/~paulgear/ntp-charm/+git/ntp-charm/+merge/361384
Reviewed-by: Stuart Bishop <email address hidden>

b1557ec... by Paul Gear on 2019-02-11

Minor test fixes

9c845a2... by Paul Gear on 2019-02-11

Allow testing on systems without jinja2 module installed

c614bd3... by Paul Gear on 2019-02-11

Address review comments

da21add... by Paul Gear on 2019-01-04

Add action for gathering diagnostics lp:1802833

29c8dcb... by Andrew McLeod on 2018-11-09

add cosmic support

Reviewed-on: https://code.launchpad.net/~admcleod/ntp-charm/+git/ntp-charm/+merge/358543
Reviewed-by: Paul Gear <email address hidden>

0a6e067... by Andrew McLeod on 2018-11-09

add cosmic support to charm

d90bd83... by Paul Gear on 2018-09-17

Remove unused copies of charmhelpers & old Nagios check.

Reviewed-on: https://code.launchpad.net/~paulgear/ntp-charm/+git/ntp-charm/+merge/355062
Reviewed-by: Paul Collins <email address hidden>

ebcd85b... by Paul Gear on 2018-09-17

Revert "Restore unused files to minimise diff"

This reverts commit 41cb90cf1cc07221a885bba08d41ef9cfd1a523f.