You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/12/07 21:13:22 UTC

[2/2] nifi git commit: Merge branch 'NIFI-1261'

Merge branch 'NIFI-1261'


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

Branch: refs/heads/master
Commit: 46623c2bf3153c50c9187415a2001ac9b3a26baa
Parents: 1f4ef9f bfe6fad
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Dec 7 15:13:12 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Dec 7 15:13:12 2015 -0500

----------------------------------------------------------------------
 .../apache/nifi/processors/standard/ListFile.java   |  4 ++--
 .../nifi/processors/standard/TestListFile.java      | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------