Merge lp:~johnsca/charms/trusty/haproxy/verterok-restart-rsyslog-after-install into lp:~verterok/charms/trusty/haproxy/restart-rsyslog-after-install
Proposed by
Cory Johns
Status: | Merged |
---|---|
Approved by: | Guillermo Gonzalez |
Approved revision: | 106 |
Merged at revision: | 106 |
Proposed branch: | lp:~johnsca/charms/trusty/haproxy/verterok-restart-rsyslog-after-install |
Merge into: | lp:~verterok/charms/trusty/haproxy/restart-rsyslog-after-install |
Diff against target: |
53 lines (+10/-7) 3 files modified
hooks/hooks.py (+6/-6) hooks/tests/test_website_hooks.py (+0/-1) tests/10_deploy_test.py (+4/-0) |
To merge this branch: | bzr merge lp:~johnsca/charms/trusty/haproxy/verterok-restart-rsyslog-after-install |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guillermo Gonzalez | Approve | ||
Review via email:
|
Description of the change
Fixed config-changed hook failure, test not catching aforementioned error, and minor lint issue.
To post a comment you must log in.
apologize for the delay.
Thanks for fixing this. I worked on a different approach, which is to move the "if config_ data.changed( "global_ log")" outside the if/else.
Will land this and merge my fix later on.
Thanks!