Merge branch 'NIFI-1246'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/76914ead Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/76914ead Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/76914ead Branch: refs/heads/master Commit: 76914ead03bb43c1666b5d3a87ee8ff96b520447 Parents: 6bdcd39 3b7512e Author: Mark Payne <[email protected]> Authored: Thu Dec 3 16:35:19 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Thu Dec 3 16:35:19 2015 -0500 ---------------------------------------------------------------------- .../nifi/processors/standard/ListFile.java | 5 +- .../nifi/processors/standard/TestListFile.java | 101 +++++++------------ 2 files changed, 38 insertions(+), 68 deletions(-) ----------------------------------------------------------------------
