lp:~paulgear/charms/trusty/ntp/sync-charm-helpers
Please see https:/
- Get this branch:
- bzr branch lp:~paulgear/charms/trusty/ntp/sync-charm-helpers
Branch merges
- Marco Ceppi (community): Approve
-
Diff: 1784 lines (+1036/-151)15 files modifiedhooks/charmhelpers/contrib/charmsupport/nrpe.py (+47/-9)
hooks/charmhelpers/contrib/templating/jinja.py (+4/-3)
hooks/charmhelpers/core/files.py (+45/-0)
hooks/charmhelpers/core/hookenv.py (+393/-43)
hooks/charmhelpers/core/host.py (+187/-24)
hooks/charmhelpers/core/hugepage.py (+71/-0)
hooks/charmhelpers/core/kernel.py (+68/-0)
hooks/charmhelpers/core/services/base.py (+43/-19)
hooks/charmhelpers/core/services/helpers.py (+24/-5)
hooks/charmhelpers/core/strutils.py (+32/-2)
hooks/charmhelpers/core/templating.py (+13/-6)
hooks/charmhelpers/core/unitdata.py (+62/-18)
hooks/charmhelpers/fetch/__init__.py (+32/-15)
hooks/charmhelpers/fetch/archiveurl.py (+7/-1)
hooks/charmhelpers/fetch/giturl.py (+8/-6)
Branch information
- Owner:
- Paul Gear
- Status:
- Merged
Recent revisions
- 23. By Chris Glass
-
Merge lp:~brad-marshall/charms/trusty/ntp/fix-nrpe-check-relationships [a=brad-marshall] [r=tribaal]
Only write out the ntp nrpe checks if there is a nrpe-external-
master relationship. - 22. By Marco Ceppi
-
[brad-marshall] The check ntp status check is now superseded by ntpmon, no longer needed.
- 21. By Tim Van Steenburgh
-
[paulgear] Merge upstream check_ntpmon.py; fixes exceptions when run on trusty
- 19. By Charles Butler
-
[r=lazypower] Charles Butler 2015-04-16 [lazypower] Ammended unit test to specify private-address
Brad Marshall 2015-04-01 [merge] [bradm] Fixed unit name on the test
Whit Morriss 2015-03-31 specify unit
Brad Marshall 2015-03-31 [bradm] Merge in nrpe fixes
Brad Marshall 2015-03-27 [bradm] Remove the total_source line
Brad Marshall 2015-03-27 [bradm] Tidied up extra unneeded lines.
Brad Marshall 2015-03-27 [bradm] Deploy ntp subordinate before adding relation to ntpmaster, c...
Brad Marshall 2015-03-27 [bradm] Apply the timeout to the sentry
Brad Marshall 2015-03-27 [bradm] Add missing type to nagios_servicegroups
Brad Marshall 2015-03-27 [bradm] Fixed nagios_servicegroup setting
Brad Marshall 2015-03-27 [bradm] Added default empty string to nagios_servicegroup, unit tests...
Brad Marshall 2015-03-25 [merge] [bradm] Fixed conflicts with upstream
Brad Marshall 2015-03-17 [bradm] Add docs on auto peers and peers config options.
Brad Marshall 2015-03-16 [bradm] Fixed use_iburst variable to work properly
Brad Marshall 2015-03-16 [bradm] Added use_iburst config variable, tidy up warning message
Brad Marshall 2015-03-16 [bradm] Fixed formatting on warning
Brad Marshall 2015-03-16 [bradm] Not using brackets inside strings
Brad Marshall 2015-03-16 [bradm] Add backslash for continued line
Brad Marshall 2015-03-16 [bradm] Added restrict line for new ntp sources to ntp.conf. Add peer...
Brad Marshall 2015-03-16 [bradm] Gave source a default value, made auto_peers a boolean
Brad Marshall 2015-03-16 [bradm] Add auto_peers config option
Brad Marshall 2015-03-16 [bradm] First cut of ntp peers relationship - 16. By Charles Butler
-
[r=cory_
fu,a=lazypower] Christopher Glass 2014-08-05 Removed ntp-specific teplating code and replaced it with the charmhelpers version instead
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:charms/ntp