Merge branch 'NIFI164' into bootstrap
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8cf0c781 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8cf0c781 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8cf0c781 Branch: refs/heads/bootstrap Commit: 8cf0c7814e7c3b451ba58eb97b8e93a3ce518ed6 Parents: 76f54f8 55d4b1c Author: Mark Payne <[email protected]> Authored: Fri Dec 12 10:01:17 2014 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Dec 12 10:01:17 2014 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/nifi/controller/FlowController.java | 4 ++++ .../nifi/controller/repository/FileSystemRepository.java | 6 ++++++ .../nifi/controller/repository/VolatileContentRepository.java | 5 +++++ .../apache/nifi/controller/repository/ContentRepository.java | 6 ++++++ 4 files changed, 21 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/8cf0c781/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java ----------------------------------------------------------------------
