Merge remote-tracking branch 'origin/trunk' into FLUME-1787
Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/6e96795c Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/6e96795c Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/6e96795c Branch: refs/heads/FLUME-1787 Commit: 6e96795ca441ab1675842924fdd99929155f7cc2 Parents: 7e15f5d 1675d49 Author: Brock Noland <[email protected]> Authored: Thu Dec 20 16:05:07 2012 -0600 Committer: Brock Noland <[email protected]> Committed: Thu Dec 20 16:05:07 2012 -0600 ---------------------------------------------------------------------- .../flume/serialization/EventSerializerType.java | 1 + .../HeaderAndBodyTextEventSerializer.java | 93 +++++++++++++ .../serialization/TestBodyTextEventSerializer.java | 2 + .../TestHeaderAndBodyTextEventSerializer.java | 103 +++++++++++++++ 4 files changed, 199 insertions(+), 0 deletions(-) ----------------------------------------------------------------------
