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/24f2d385 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/24f2d385 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/24f2d385 Branch: refs/heads/trunk Commit: 24f2d3858da37b6f6823bf29fb1effd0f334d15a Parents: 154b206 d6e5a2d Author: Juhani Connolly <[email protected]> Authored: Thu Jul 26 10:57:08 2012 +0900 Committer: Juhani Connolly <[email protected]> Committed: Thu Jul 26 10:57:08 2012 +0900 ---------------------------------------------------------------------- .../org/apache/flume/channel/file/FileChannel.java | 7 +- .../java/org/apache/flume/channel/file/Log.java | 7 +- .../org/apache/flume/channel/file/LogFile.java | 6 +- .../flume/channel/file/TransactionEventRecord.java | 2 +- .../channel/file/TestTransactionEventRecord.java | 2 +- .../flume/instrumentation/GangliaServer.java | 15 +- .../apache/flume/interceptor/InterceptorType.java | 3 +- .../interceptor/RegexFilteringInterceptor.java | 176 +++++++++++++++ .../interceptor/TestRegexFilteringInterceptor.java | 103 +++++++++ flume-ng-doc/sphinx/FlumeUserGuide.rst | 139 +++++++++--- .../org/apache/flume/sink/hdfs/HDFSEventSink.java | 6 +- 11 files changed, 411 insertions(+), 55 deletions(-) ----------------------------------------------------------------------
