You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/01/27 19:53:26 UTC
[3/3] incubator-nifi git commit: Merge branch 'NIFI-250' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Merge branch 'NIFI-250' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2d7c700d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2d7c700d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2d7c700d
Branch: refs/heads/NIFI-250
Commit: 2d7c700d173e757ca51b7b9832c9b385a67061c5
Parents: ec082f1 ea17dbe
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Jan 27 13:53:02 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Jan 27 13:53:02 2015 -0500
----------------------------------------------------------------------
.../cluster/manager/impl/WebClusterManager.java | 16 ++++
.../nifi/controller/ReportingTaskNode.java | 4 +-
.../service/ControllerServiceNode.java | 4 +-
.../apache/nifi/controller/FlowController.java | 40 ++++++++-
.../nifi/controller/StandardFlowSerializer.java | 4 +-
.../controller/StandardFlowSynchronizer.java | 4 +-
.../reporting/AbstractReportingTaskNode.java | 4 +-
.../service/StandardControllerServiceNode.java | 4 +-
.../ControllerServiceConfiguration.xsd | 61 --------------
.../src/main/resources/FlowConfiguration.xsd | 59 +++++++++++--
.../resources/ReportingTaskConfiguration.xsd | 87 --------------------
.../org/apache/nifi/web/api/dto/DtoFactory.java | 2 +-
12 files changed, 119 insertions(+), 170 deletions(-)
----------------------------------------------------------------------