Merge branch 'NIFI-230' 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/531136db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/531136db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/531136db

Branch: refs/heads/develop
Commit: 531136db98743664fbe01f10947a7d7c26ecb4aa
Parents: 548f6d0 c4d186b
Author: Mark Payne <marka...@hotmail.com>
Authored: Fri Jun 19 13:12:09 2015 -0400
Committer: Mark Payne <marka...@hotmail.com>
Committed: Fri Jun 19 13:12:09 2015 -0400

----------------------------------------------------------------------
 .../repository/VolatileContentRepository.java         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/531136db/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/VolatileContentRepository.java
----------------------------------------------------------------------

Reply via email to