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/08/12 16:01:41 UTC
[2/6] nifi git commit: Merge remote-tracking branch 'apache/develop'
into develop
Merge remote-tracking branch 'apache/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/97f33d5c
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/97f33d5c
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/97f33d5c
Branch: refs/heads/develop
Commit: 97f33d5c51dfd5178c10ad88fb3701f363ae39a4
Parents: e5444aa f58972e
Author: Brian Ghigiarelli <br...@gmail.com>
Authored: Fri Jun 26 11:21:49 2015 -0400
Committer: Brian Ghigiarelli <br...@gmail.com>
Committed: Fri Jun 26 11:21:49 2015 -0400
----------------------------------------------------------------------
.../nifi/provenance/lineage/LineageNode.java | 1 +
nifi/nifi-assembly/pom.xml | 1 +
.../nifi/provenance/lineage/EventNode.java | 2 +
.../nifi/provenance/lineage/FlowFileNode.java | 1 +
.../org/apache/nifi/util/NiFiProperties.java | 22 +-
.../src/main/asciidoc/administration-guide.adoc | 2 +-
.../nifi/util/MockConfigurationContext.java | 18 +-
.../nifi/util/StandardProcessorTestRunner.java | 12 +-
.../java/org/apache/nifi/util/TestRunner.java | 45 +++
.../CurrentTestStandardProcessorTestRunner.java | 71 +++++
.../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 15 +-
.../repository/StandardProcessSession.java | 2 +-
.../repository/StandardProvenanceReporter.java | 8 +-
.../src/main/resources/bin/nifi.sh | 4 +
.../src/main/resources/conf/nifi.properties | 3 +
.../nifi-web-ui/src/main/webapp/css/main.css | 1 +
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 2 +-
.../js/nf/canvas/nf-controller-service.js | 4 +-
.../src/main/webapp/js/nf/nf-common.js | 17 ++
.../apache/nifi/processors/kafka/PutKafka.java | 301 ++++++++++++++-----
.../nifi/processors/kafka/TestPutKafka.java | 163 ++++++++++
.../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 +-
.../nifi/processors/standard/ExtractText.java | 4 +-
.../nifi/processors/standard/MergeContent.java | 57 ++--
34 files changed, 795 insertions(+), 180 deletions(-)
----------------------------------------------------------------------