Merge lp://staging/~bloodearnest/charms/trusty/apache2/update-charm-helpers into lp://staging/charms/trusty/apache2
Proposed by
Simon Davy
| Status: | Merged |
|---|---|
| Merged at revision: | 63 |
| Proposed branch: | lp://staging/~bloodearnest/charms/trusty/apache2/update-charm-helpers |
| Merge into: | lp://staging/charms/trusty/apache2 |
| Diff against target: |
1974 lines (+1090/-276) 16 files modified
Makefile (+1/-1) charm-helpers.yaml (+2/-2) config-manager.txt (+1/-1) hooks/charmhelpers/__init__.py (+38/-0) hooks/charmhelpers/contrib/__init__.py (+15/-0) hooks/charmhelpers/contrib/charmsupport/__init__.py (+15/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+150/-10) hooks/charmhelpers/contrib/charmsupport/volumes.py (+21/-2) hooks/charmhelpers/core/__init__.py (+15/-0) hooks/charmhelpers/core/hookenv.py (+269/-41) hooks/charmhelpers/fetch/__init__.py (+309/-79) hooks/charmhelpers/fetch/archiveurl.py (+121/-8) hooks/charmhelpers/fetch/bzrurl.py (+39/-5) hooks/charmhelpers/fetch/giturl.py (+71/-0) hooks/tests/test_create_vhost.py (+1/-1) hooks/tests/test_nrpe_hooks.py (+22/-126) |
| To merge this branch: | bzr merge lp://staging/~bloodearnest/charms/trusty/apache2/update-charm-helpers |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tom Haddon | Approve | ||
|
Review via email:
|
|||
Commit message
Update charm-helpers to latest rev.
Description of the change
Update charm-helpers to latest rev.
Replace old nrpe tests with new simpler tests that actually test the code in this char, not test the implementation details of the charm-helpers library
Fix a lint bug, duplicate test method.
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
Looks like a pretty self-contained update, and tests still pass, so I'll approve and merge