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 <[email protected]> Authored: Fri Dec 12 10:25:39 2014 -0500 Committer: Mark Payne <[email protected]> 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(+) ----------------------------------------------------------------------
