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:19 UTC
[04/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/e79db821
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e79db821
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e79db821
Branch: refs/heads/NIFI-433
Commit: e79db821b613143483c4959177b19aa4428d20a9
Parents: 6bbd172 4a16845
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Apr 6 07:20:24 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Apr 6 07:20:24 2015 -0400
----------------------------------------------------------------------
.../cluster/manager/impl/WebClusterManager.java | 4 +--
.../exception/ComponentLifeCycleException.java | 30 ++++++++++++++++++++
.../exception/ProcessorLifeCycleException.java | 30 --------------------
.../apache/nifi/controller/FlowController.java | 6 ++--
.../reporting/AbstractReportingTaskNode.java | 4 +--
.../service/StandardControllerServiceNode.java | 4 +--
.../StandardControllerServiceProvider.java | 4 +--
.../nifi/groups/StandardProcessGroup.java | 4 +--
.../nifi/web/dao/impl/StandardProcessorDAO.java | 8 +++---
.../web/dao/impl/StandardReportingTaskDAO.java | 4 +--
.../processors/standard/EvaluateJsonPath.java | 1 +
11 files changed, 50 insertions(+), 49 deletions(-)
----------------------------------------------------------------------