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/73e5364b Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/73e5364b Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/73e5364b Branch: refs/heads/trunk Commit: 73e5364b6683a5bbc4b1b93c5fab30be6ac66cc7 Parents: 24f2d38 eaee422 Author: Juhani Connolly <[email protected]> Authored: Fri Aug 3 15:57:10 2012 +0900 Committer: Juhani Connolly <[email protected]> Committed: Fri Aug 3 15:57:10 2012 +0900 ---------------------------------------------------------------------- flume-ng-channels/flume-file-channel/pom.xml | 5 + .../org/apache/flume/conf/FlumeConfiguration.java | 14 +- .../org/apache/flume/channel/ChannelProcessor.java | 5 + .../flume/instrumentation/GangliaServer.java | 73 ++-- .../flume/lifecycle/LifecycleSupervisor.java | 148 ++++---- .../apache/flume/source/PollableSourceRunner.java | 2 + .../java/org/apache/flume/tools/VersionInfo.java | 15 +- flume-ng-doc/sphinx/FlumeUserGuide.rst | 26 +- .../file/AbstractFileConfigurationProvider.java | 3 + .../org/apache/flume/sink/hdfs/BucketWriter.java | 10 +- .../org/apache/flume/sink/hdfs/HDFSEventSink.java | 1 - .../apache/flume/sink/hdfs/HDFSSequenceFile.java | 2 +- .../apache/flume/sink/hbase/AsyncHBaseSink.java | 274 +++++++++------ .../hbase/HBaseSinkConfigurationConstants.java | 3 + pom.xml | 6 + 15 files changed, 355 insertions(+), 232 deletions(-) ----------------------------------------------------------------------
