Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0d6e81b5 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0d6e81b5 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0d6e81b5 Branch: refs/heads/master Commit: 0d6e81b54f13575cb960ca65eafcd20cf19db85c Parents: 1a388f9 ee87f33 Author: Mark Payne <[email protected]> Authored: Fri Nov 6 09:16:12 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Nov 6 09:16:12 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/controller/StandardFlowFileQueue.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
