Merge branch 'NIFI-905'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2bb78530 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2bb78530 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2bb78530 Branch: refs/heads/master Commit: 2bb7853001c680b54282c0720ceba4ae9c477556 Parents: f8c216b 3159cec Author: Mark Payne <[email protected]> Authored: Mon Aug 31 11:14:17 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Mon Aug 31 11:14:17 2015 -0400 ---------------------------------------------------------------------- .../repository/FileSystemRepository.java | 86 +++++++++++++------- 1 file changed, 57 insertions(+), 29 deletions(-) ----------------------------------------------------------------------
