You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by de...@apache.org on 2015/04/08 20:05:22 UTC

[07/14] incubator-nifi git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

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/4f015f5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4f015f5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4f015f5f

Branch: refs/heads/NIFI-433
Commit: 4f015f5f435c9cf4d27c522e2363c5b2d338525c
Parents: e79db82 3a2b12d
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Apr 7 10:14:09 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Apr 7 10:14:09 2015 -0400

----------------------------------------------------------------------
 .../nifi/controller/scheduling/StandardProcessScheduler.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------