You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by ju...@apache.org on 2012/08/15 09:00:19 UTC
[7/10] git commit: Merge branch 'trunk' of git://git.apache.org/flume
into new-trunk
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 <ju...@cyberagent.co.jp>
Authored: Thu Jul 19 12:23:13 2012 +0900
Committer: Juhani Connolly <ju...@cyberagent.co.jp>
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(-)
----------------------------------------------------------------------