From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BB11E58973 for ; Tue, 9 Feb 2016 10:26:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7987621C100; Tue, 9 Feb 2016 10:26:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B902221C0C3 for ; Tue, 9 Feb 2016 10:26:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ED03F3409E2 for ; Tue, 9 Feb 2016 10:26:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9E85E8DF for ; Tue, 9 Feb 2016 10:26:44 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1455013588.5d8238e96feb969dbf7c761c6d75e1889c09aff0.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: / X-VCS-Repository: repo/gentoo X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 5d8238e96feb969dbf7c761c6d75e1889c09aff0 X-VCS-Branch: master Date: Tue, 9 Feb 2016 10:26:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 092dea18-7626-479c-9b63-6ec10f26b5e9 X-Archives-Hash: bdfcde2c5d3a9a833edbbda923086f47 commit: 5d8238e96feb969dbf7c761c6d75e1889c09aff0 Author: Ian Delaney gentoo org> AuthorDate: Tue Feb 9 10:24:58 2016 +0000 Commit: Ian Delaney gentoo 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(-)