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/245fef4e Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/245fef4e Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/245fef4e Branch: refs/heads/develop Commit: 245fef4ee2728bdb6f69106853ed865540cd5bb5 Parents: 6324442 63bdda4 Author: Matt Gilman <[email protected]> Authored: Fri Jun 5 23:38:59 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Jun 5 23:38:59 2015 -0400 ---------------------------------------------------------------------- .../java/org/apache/nifi/controller/FlowFileQueue.java | 9 +++++++++ .../apache/nifi/controller/StandardFlowFileQueue.java | 13 +++++++++---- .../apache/nifi/connectable/StandardConnection.java | 4 ++++ 3 files changed, 22 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
