Merge branch 'develop' into ListHDFS
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/25e2b6c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/25e2b6c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/25e2b6c8 Branch: refs/heads/develop Commit: 25e2b6c8add6ebbc281cb1189d49d7fa14e27228 Parents: e0d4484 fb8984c Author: Mark Payne <[email protected]> Authored: Wed Apr 29 16:14:01 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Apr 29 16:14:01 2015 -0400 ---------------------------------------------------------------------- .../nifi/provenance/IndexConfiguration.java | 16 +- .../PersistentProvenanceRepository.java | 104 +++++-- .../nifi/provenance/StandardRecordWriter.java | 20 +- .../nifi/provenance/lucene/LineageQuery.java | 103 ++++--- .../provenance/serialization/RecordWriter.java | 3 +- .../nifi/provenance/toc/StandardTocReader.java | 51 +++- .../nifi/provenance/toc/StandardTocWriter.java | 5 +- .../apache/nifi/provenance/toc/TocReader.java | 9 + .../apache/nifi/provenance/toc/TocWriter.java | 7 +- .../TestStandardRecordReaderWriter.java | 16 +- .../provenance/toc/TestStandardTocReader.java | 29 +- .../processors/standard/ExecuteProcess.java | 301 ++++++++++--------- .../processors/standard/TestExecuteProcess.java | 82 +++++ 13 files changed, 486 insertions(+), 260 deletions(-) ----------------------------------------------------------------------
