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/cd69a423 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/cd69a423 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/cd69a423 Branch: refs/heads/NIFI-250 Commit: cd69a423dd6411cdefe1a3131865fc45f440d426 Parents: 6b36aef f556490 Author: Matt Gilman <[email protected]> Authored: Fri Mar 13 10:11:22 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Fri Mar 13 10:11:22 2015 -0400 ---------------------------------------------------------------------- .../cluster/manager/impl/WebClusterManager.java | 9 ++++++ .../service/ControllerServiceProvider.java | 33 ++++++++++++++++---- .../apache/nifi/controller/FlowController.java | 10 ++++++ .../StandardControllerServiceProvider.java | 20 ++++++++++++ 4 files changed, 66 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/cd69a423/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java ----------------------------------------------------------------------
