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/17ba20b3 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/17ba20b3 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/17ba20b3 Branch: refs/heads/trunk Commit: 17ba20b3f5293b74a887020fa12fee944e3f0e8d Parents: 73e5364 b9960ab Author: Juhani Connolly <[email protected]> Authored: Tue Aug 7 10:33:54 2012 +0900 Committer: Juhani Connolly <[email protected]> Committed: Tue Aug 7 10:33:54 2012 +0900 ---------------------------------------------------------------------- .../apache/flume/channel/file/FlumeEventQueue.java | 13 +++-- .../java/org/apache/flume/channel/file/Log.java | 37 ++++++++++----- flume-ng-doc/sphinx/FlumeDeveloperGuide.rst | 4 +- 3 files changed, 35 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
