You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/11/11 17:38:32 UTC

[2/2] nifi git commit: Merge branch 'NIFI-1061' of https://github.com/olegz/nifi into NIFI-1061

Merge branch 'NIFI-1061' of https://github.com/olegz/nifi into NIFI-1061


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/054774fe
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/054774fe
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/054774fe

Branch: refs/heads/master
Commit: 054774fe7b9fa58abb9afcd6773337059c1652f6
Parents: 429f6a4 76690a8
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Nov 11 11:17:25 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Nov 11 11:17:25 2015 -0500

----------------------------------------------------------------------
 .../scheduling/StandardProcessScheduler.java     |  7 +++++--
 .../org/apache/nifi/dbcp/DBCPConnectionPool.java | 19 +++++++------------
 2 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------