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/25796ec1 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/25796ec1 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/25796ec1 Branch: refs/heads/trunk Commit: 25796ec1eefa69c3614d3e944bd7a18bdbef8ae9 Parents: 17ba20b 525fb23 Author: Juhani Connolly <[email protected]> Authored: Mon Aug 13 14:30:35 2012 +0900 Committer: Juhani Connolly <[email protected]> Committed: Mon Aug 13 14:30:35 2012 +0900 ---------------------------------------------------------------------- conf/log4j.properties | 7 +++-- .../java/org/apache/flume/channel/file/Log.java | 5 +++- .../apache/flume/channel/file/TestFileChannel.java | 6 +++- .../org/apache/flume/channel/file/TestLog.java | 22 +++++++++----- 4 files changed, 26 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
