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/03/06 16:17:28 UTC
[46/50] 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/6b429bf4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6b429bf4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6b429bf4
Branch: refs/heads/NIFI-250
Commit: 6b429bf42b5f31e6b7bfc18d932c9cd48a67e702
Parents: f34e343 883c4ac
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Mar 6 08:19:26 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Mar 6 08:19:26 2015 -0500
----------------------------------------------------------------------
.../cluster/manager/impl/WebClusterManager.java | 27 +++++++--
.../reporting/ReportingTaskProvider.java | 61 ++++++++++++++++++++
.../apache/nifi/controller/FlowController.java | 4 +-
3 files changed, 86 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6b429bf4/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
----------------------------------------------------------------------
diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
index 030ec82,f3dd0a0..39ca417
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java
@@@ -66,9 -68,12 +68,10 @@@ import javax.xml.transform.stream.Strea
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.admin.service.AuditService;
+ import org.apache.nifi.annotation.lifecycle.OnAdded;
import org.apache.nifi.annotation.lifecycle.OnRemoved;
import org.apache.nifi.cluster.BulletinsPayload;
-import org.apache.nifi.cluster.ClusterNodeInformation;
import org.apache.nifi.cluster.HeartbeatPayload;
-import org.apache.nifi.cluster.NodeInformation;
import org.apache.nifi.cluster.context.ClusterContext;
import org.apache.nifi.cluster.context.ClusterContextImpl;
import org.apache.nifi.cluster.event.Event;