Merge branch 'NIFI-378' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e767f5ce Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e767f5ce Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e767f5ce Branch: refs/heads/NIFI-680 Commit: e767f5ce02c36f41874d4f97abdb50c643662deb Parents: 1692560 ddad70b Author: Mark Payne <marka...@hotmail.com> Authored: Tue Jun 23 11:17:30 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Tue Jun 23 11:17:30 2015 -0400 ---------------------------------------------------------------------- .../nifi/processors/standard/MergeContent.java | 57 +++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
