~verterok/charms/trusty/logstash/merge-canonical-is-sa

Viewing all changes in revision 55.

  • Committer: Guillermo Gonzalez
  • Date: 2015-09-07 21:39:38 UTC
  • mfrom: (47.1.6 logstash)
  • Revision ID: guillermo.gonzalez@canonical.com-20150907213938-0wme0ijwfvc2i860
merge with lp:~canonical-is-sa/charms/trusty/logstash/trunk

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: