Merge lp://staging/~joeborg/charm-helpers/apache-hardening into lp://staging/charm-helpers
Proposed by
Joseph Borg
| Status: | Merged |
|---|---|
| Merged at revision: | 722 |
| Proposed branch: | lp://staging/~joeborg/charm-helpers/apache-hardening |
| Merge into: | lp://staging/charm-helpers |
| Diff against target: |
119 lines (+28/-12) 6 files modified
charmhelpers/contrib/hardening/apache/checks/config.py (+3/-2) charmhelpers/contrib/hardening/apache/templates/99-hardening.conf (+3/-0) charmhelpers/contrib/hardening/defaults/apache.yaml (+2/-0) charmhelpers/contrib/hardening/defaults/apache.yaml.schema (+2/-0) tests/contrib/hardening/apache/checks/test_config.py (+15/-9) tests/contrib/hardening/test_templating.py (+3/-1) |
| To merge this branch: | bzr merge lp://staging/~joeborg/charm-helpers/apache-hardening |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Edward Hope-Morley | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Edward Hope-Morley (hopem) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
