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 2014/12/12 16:32:14 UTC
[4/5] incubator-nifi git commit: Merge branch 'NIFI164' into develop
Merge branch 'NIFI164' 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/67354bd3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/67354bd3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/67354bd3
Branch: refs/heads/bootstrap
Commit: 67354bd31cafe1b646e9a4102c251c0772ef39af
Parents: 52eadeb d57861d
Author: Mark Payne <ma...@hotmail.com>
Authored: Fri Dec 12 10:25:39 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Fri Dec 12 10:25:39 2014 -0500
----------------------------------------------------------------------
.../main/java/org/apache/nifi/controller/FlowController.java | 4 ++++
.../nifi/controller/repository/FileSystemRepository.java | 6 ++++++
.../nifi/controller/repository/VolatileContentRepository.java | 5 +++++
.../nifi/controller/repository/TestStandardProcessSession.java | 4 ++++
.../apache/nifi/provenance/VolatileProvenanceRepository.java | 2 ++
.../apache/nifi/controller/repository/ContentRepository.java | 6 ++++++
6 files changed, 27 insertions(+)
----------------------------------------------------------------------