You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nifi.apache.org by mc...@apache.org on 2015/10/30 15:30:04 UTC

[38/50] [abbrv] nifi git commit: Merge branch 'NIFI-447'

Merge branch 'NIFI-447'


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/af19053a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/af19053a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/af19053a

Branch: refs/heads/NIFI-655
Commit: af19053a7f7e23f40530561530cfc56c0ad961d4
Parents: b885f95 07238c7
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Oct 27 10:42:46 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Oct 27 10:42:46 2015 -0400

----------------------------------------------------------------------
 .../nifi-standard-processors/pom.xml            |   5 +-
 .../nifi/processors/standard/ReplaceText.java   | 431 +++++++++----
 .../processors/standard/TestReplaceText.java    | 635 ++++++++++++++++++-
 .../standard/TestReplaceTextLineByLine.java     | 336 ----------
 .../AppendLineByLineTest.txt                    |  11 +
 .../PrependLineByLineTest.txt                   |  11 +
 6 files changed, 953 insertions(+), 476 deletions(-)
----------------------------------------------------------------------