Merge branch 'NIFI-446' of https://github.com/bbende/incubator-nifi into NIFI-446-merge-content-delimiter-strategy
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f247e515 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f247e515 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f247e515 Branch: refs/heads/develop Commit: f247e515dcd8f6f2ec1ddeb95dd4dfa6a0dfb165 Parents: 149ad13 3cf6526 Author: Mark Payne <[email protected]> Authored: Wed May 20 14:47:53 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Wed May 20 14:47:53 2015 -0400 ---------------------------------------------------------------------- .../nifi/processors/standard/MergeContent.java | 92 +++++++++++++++++-- .../processors/standard/TestMergeContent.java | 97 ++++++++++++++++++++ 2 files changed, 179 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
