Merge lp://staging/~verterok/charms/trusty/logstash/merge-canonical-is-sa into lp://staging/~tanuki/charms/trusty/logstash/trunk
Proposed by
Guillermo Gonzalez
| Status: | Merged |
|---|---|
| Approved by: | Celso Providelo |
| Approved revision: | 56 |
| Merged at revision: | 56 |
| Proposed branch: | lp://staging/~verterok/charms/trusty/logstash/merge-canonical-is-sa |
| Merge into: | lp://staging/~tanuki/charms/trusty/logstash/trunk |
| Diff against target: |
2823 lines (+1907/-134) 30 files modified
charm-helpers.yaml (+1/-0) config.yaml (+24/-0) hooks/client-relation-changed (+3/-1) hooks/config-changed (+2/-0) hooks/nrpe-external-master-relation-changed (+39/-0) lib/charmhelpers/contrib/charmsupport/__init__.py (+15/-0) lib/charmhelpers/contrib/charmsupport/nrpe.py (+360/-0) lib/charmhelpers/contrib/charmsupport/volumes.py (+175/-0) lib/charmhelpers/contrib/templating/__init__.py (+15/-0) lib/charmhelpers/contrib/templating/jinja.py (+25/-9) lib/charmhelpers/core/__init__.py (+15/-0) lib/charmhelpers/core/decorators.py (+57/-0) lib/charmhelpers/core/fstab.py (+30/-12) lib/charmhelpers/core/hookenv.py (+105/-22) lib/charmhelpers/core/host.py (+103/-38) lib/charmhelpers/core/services/__init__.py (+18/-2) lib/charmhelpers/core/services/base.py (+16/-0) lib/charmhelpers/core/services/helpers.py (+37/-9) lib/charmhelpers/core/strutils.py (+42/-0) lib/charmhelpers/core/sysctl.py (+56/-0) lib/charmhelpers/core/templating.py (+20/-3) lib/charmhelpers/core/unitdata.py (+477/-0) lib/charmhelpers/fetch/__init__.py (+44/-14) lib/charmhelpers/fetch/archiveurl.py (+76/-22) lib/charmhelpers/fetch/bzrurl.py (+30/-2) lib/charmhelpers/fetch/giturl.py (+71/-0) lib/charmhelpers/payload/__init__.py (+16/-0) lib/charmhelpers/payload/archive.py (+16/-0) lib/charmhelpers/payload/execd.py (+16/-0) metadata.yaml (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~verterok/charms/trusty/logstash/merge-canonical-is-sa |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Celso Providelo (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge lp:~canonical-is-sa/charms/trusty/logstash/trunk (add nagios checks, fix client-
Description of the change
Merge lp:~canonical-is-sa/charms/trusty/logstash/trunk:
- add nagios checks for logstash and fixed client-
- update charmhelpers
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1, thank you.