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/11/10 21:12:57 UTC
[6/7] nifi git commit: Merge branch 'NIFI-1000'
Merge branch 'NIFI-1000'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/72008035
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/72008035
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/72008035
Branch: refs/heads/master
Commit: 72008035b128a60e3e342b318c3e0a50b8928dbb
Parents: e748fd5 8f942fc
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Nov 10 15:02:02 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Nov 10 15:02:02 2015 -0500
----------------------------------------------------------------------
.../java/org/apache/nifi/flowfile/FlowFile.java | 7 ++
.../nifi/provenance/ProvenanceEventRecord.java | 9 ++-
.../nifi/provenance/StandardQueryResult.java | 23 +++++-
.../repository/StandardFlowFileRecord.java | 24 ++++--
.../TestPersistentProvenanceRepository.java | 78 ++------------------
.../nifi-standard-processors/pom.xml | 5 ++
.../nifi/processors/standard/JmsConsumer.java | 6 +-
.../processors/standard/util/JmsFactory.java | 8 +-
.../processors/standard/TestGetJMSQueue.java | 62 +++++++++++++---
pom.xml | 8 +-
10 files changed, 135 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/72008035/pom.xml
----------------------------------------------------------------------