Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi 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/1f139e21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/1f139e21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/1f139e21 Branch: refs/heads/develop Commit: 1f139e21988c822114a6bed8adda197d1414722c Parents: 3f3fe3c c4d1666 Author: Matt Gilman <[email protected]> Authored: Wed May 13 19:27:46 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Wed May 13 19:27:46 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/pom.xml | 18 ++---- .../impl/FileBasedClusterNodeFirewallTest.java | 28 ++++----- .../expiration/FileRemovalAction.java | 28 +++++++-- .../nifi/provenance/lucene/DocsReader.java | 25 +++++--- .../nifi/provenance/lucene/IndexManager.java | 61 +++++++++++++++++--- 5 files changed, 113 insertions(+), 47 deletions(-) ----------------------------------------------------------------------
