Merge lp://qastaging/~niedbalski/charms/trusty/rsyslog-forwarder-ha/fix-1594965 into lp://qastaging/charms/trusty/rsyslog-forwarder-ha
Proposed by
Jorge Niedbalski
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~niedbalski/charms/trusty/rsyslog-forwarder-ha/fix-1594965 |
| Merge into: | lp://qastaging/charms/trusty/rsyslog-forwarder-ha |
| Diff against target: |
87 lines (+39/-1) (has conflicts) 3 files modified
config.yaml (+8/-0) hooks/hooks.py (+21/-1) templates/standalone.template (+10/-0) Text conflict in config.yaml Text conflict in hooks/hooks.py |
| To merge this branch: | bzr merge lp://qastaging/~niedbalski/charms/trusty/rsyslog-forwarder-ha/fix-1594965 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
This fixes bug LP: #1594965
To post a comment you must log in.
Revision history for this message
| Stuart Bishop (stub) wrote | # |
Unmerged revisions
- 12. By Jorge Niedbalski
-
standalone template added
- 11. By Jorge Niedbalski
-
standalone template added
- 10. By Jorge Niedbalski
-
standalone template added
- 9. By Jorge Niedbalski
-
Fix for LP: #1594965
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
You have merge conflict markers