Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi 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/2d0bb1c1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2d0bb1c1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2d0bb1c1 Branch: refs/heads/develop Commit: 2d0bb1c1cd3ab4aaade11a13fa718b331fbe1b7f Parents: 5fe9975 a1f0438 Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Fri Jun 19 11:50:02 2015 -0400 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Fri Jun 19 11:50:02 2015 -0400 ---------------------------------------------------------------------- .../repository/VolatileContentRepository.java | 30 ++++++++------------ 1 file changed, 12 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
