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/develop Commit: 4f015f5f435c9cf4d27c522e2363c5b2d338525c Parents: e79db82 3a2b12d Author: Matt Gilman <[email protected]> Authored: Tue Apr 7 10:14:09 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Apr 7 10:14:09 2015 -0400 ---------------------------------------------------------------------- .../nifi/controller/scheduling/StandardProcessScheduler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
