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/628e6399 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/628e6399 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/628e6399 Branch: refs/heads/NIFI-632 Commit: 628e63998c43934432bbf02219bc20991545223e Parents: 908ec18 25146a5 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Mon Jun 22 16:43:25 2015 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Mon Jun 22 16:43:25 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/pom.xml | 1 + .../src/main/resources/conf/nifi.properties | 3 + .../nifi/provenance/IndexConfiguration.java | 2 +- .../PersistentProvenanceRepository.java | 90 +++++++++++++++++--- .../provenance/RepositoryConfiguration.java | 18 ++++ .../nifi/provenance/StandardRecordReader.java | 15 ++-- .../provenance/lucene/DeleteIndexAction.java | 6 +- .../nifi/provenance/lucene/DocsReader.java | 9 +- .../nifi/provenance/lucene/IndexSearch.java | 7 +- .../nifi/provenance/lucene/LineageQuery.java | 6 +- .../provenance/serialization/RecordReaders.java | 17 +++- .../TestPersistentProvenanceRepository.java | 39 ++++++++- .../TestStandardRecordReaderWriter.java | 10 +-- 13 files changed, 180 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
