commit: 5d8238e96feb969dbf7c761c6d75e1889c09aff0 Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> AuthorDate: Tue Feb 9 10:24:58 2016 +0000 Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> CommitDate: Tue Feb 9 10:26:28 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8238e9
Merge remote-tracking branch 'remotes/hydrapolic/logstash' Pull request: https://github.com/gentoo/gentoo/pull/822 app-admin/logstash-bin/Manifest | 7 ++- app-admin/logstash-bin/files/agent.conf.sample | 3 +- app-admin/logstash-bin/files/agent.conf.sample-r2 | 20 --------- .../files/{logstash.confd-r2 => logstash.confd} | 0 app-admin/logstash-bin/files/logstash.confd-r1 | 7 --- .../files/{logstash.initd-r2 => logstash.initd} | 2 +- app-admin/logstash-bin/files/logstash.initd-r1 | 44 ------------------ app-admin/logstash-bin/logstash-bin-2.1.1.ebuild | 52 ---------------------- ...-bin-1.5.6.ebuild => logstash-bin-2.1.2.ebuild} | 8 ++-- ...-bin-2.1.0.ebuild => logstash-bin-2.2.0.ebuild} | 8 ++-- 10 files changed, 13 insertions(+), 138 deletions(-)
