Return-Path: X-Original-To: apmail-flume-commits-archive@www.apache.org Delivered-To: apmail-flume-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 43B1EDAC5 for ; Wed, 15 Aug 2012 07:00:27 +0000 (UTC) Received: (qmail 12421 invoked by uid 500); 15 Aug 2012 07:00:27 -0000 Delivered-To: apmail-flume-commits-archive@flume.apache.org Received: (qmail 12347 invoked by uid 500); 15 Aug 2012 07:00:26 -0000 Mailing-List: contact commits-help@flume.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flume.apache.org Delivered-To: mailing list commits@flume.apache.org Received: (qmail 11748 invoked by uid 99); 15 Aug 2012 07:00:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Aug 2012 07:00:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 550E71D563; Wed, 15 Aug 2012 07:00:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: juhanic@apache.org To: commits@flume.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/10] git commit: Merge branch 'trunk' of git://git.apache.org/flume into new-trunk Message-Id: <20120815070019.550E71D563@tyr.zones.apache.org> Date: Wed, 15 Aug 2012 07:00:19 +0000 (UTC) Merge branch 'trunk' of git://git.apache.org/flume into new-trunk Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/154b2068 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/154b2068 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/154b2068 Branch: refs/heads/trunk Commit: 154b206820b22af1e963170777889c2762ee8aec Parents: a459732 d81ffde Author: Juhani Connolly Authored: Thu Jul 19 12:23:13 2012 +0900 Committer: Juhani Connolly Committed: Thu Jul 19 12:23:13 2012 +0900 ---------------------------------------------------------------------- DEVNOTES | 17 + .../org/apache/flume/channel/file/LogFile.java | 12 +- flume-ng-core/pom.xml | 6 + .../org/apache/flume/channel/ChannelProcessor.java | 8 +- .../flume/instrumentation/GangliaServer.java | 372 +++++++++++++++ .../flume/instrumentation/MonitorService.java | 35 ++ .../flume/instrumentation/MonitoringType.java | 38 ++ .../apache/flume/interceptor/HostInterceptor.java | 2 +- .../flume/interceptor/StaticInterceptor.java | 2 +- .../java/org/apache/flume/source/AvroSource.java | 7 +- .../apache/flume/channel/TestChannelProcessor.java | 82 ++++ flume-ng-doc/sphinx/FlumeUserGuide.rst | 74 +++- .../nodemanager/DefaultLogicalNodeManager.java | 48 ++ 13 files changed, 681 insertions(+), 22 deletions(-) ----------------------------------------------------------------------