Merge lp:~paulcz/charms/precise/logstash-agent/trunk into lp:charms/logstash-agent
Proposed by
Paul Czarkowski
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~paulcz/charms/precise/logstash-agent/trunk | ||||
Merge into: | lp:charms/logstash-agent | ||||
Diff against target: |
254 lines (+102/-41) 11 files modified
files/charm/input_file_apache.conf (+0/-12) files/charm/input_file_misc.conf (+24/-0) files/charm/input_file_syslog.conf (+0/-1) files/charm/logstash-agent.conf (+1/-1) hooks/amqp-relation-changed (+46/-0) hooks/amqp-relation-joined (+10/-0) hooks/common.sh (+6/-3) hooks/config-changed (+0/-13) hooks/install (+9/-9) metadata.yaml (+5/-1) revision (+1/-1) |
||||
To merge this branch: | bzr merge lp:~paulcz/charms/precise/logstash-agent/trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Whit Morriss (community) | Needs Information | ||
Marco Ceppi (community) | Needs Information | ||
Review via email: mp+188241@code.launchpad.net |
Description of the change
updated to support logstash v 1.2.x
To post a comment you must log in.
Unmerged revisions
- 6. By Paul Czarkowski
-
removed apache config
- 5. By Paul Czarkowski
-
added more inputs
- 4. By Paul Czarkowski
-
amqp relationship
- 3. By Paul Czarkowski
-
updated to support logstash 1.2.x
Why update the checksum but then remove the cryptographic verification?