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/12/31 21:37:36 UTC
[4/5] nifi git commit: Merge branch 'NIFI-1164' of
https://github.com/olegz/nifi into NIFI-1164
Merge branch 'NIFI-1164' of https://github.com/olegz/nifi into NIFI-1164
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/71544cd2
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/71544cd2
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/71544cd2
Branch: refs/heads/master
Commit: 71544cd22b0e1269bc3f3afa672da3897a6176ed
Parents: 03730ad 602c4a9
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Dec 31 15:22:09 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Dec 31 15:22:09 2015 -0500
----------------------------------------------------------------------
.../service/ControllerServiceNode.java | 40 ++-
.../scheduling/StandardProcessScheduler.java | 151 +--------
.../service/StandardControllerServiceNode.java | 139 +++++++-
.../StandardControllerServiceProvider.java | 35 +-
.../StandardControllerServiceReference.java | 3 +-
.../TestStandardProcessScheduler.java | 338 +++++++++++++++++++
.../TestStandardControllerServiceProvider.java | 2 +-
7 files changed, 530 insertions(+), 178 deletions(-)
----------------------------------------------------------------------