Merge branch 'NIFI-250' of http://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/fe09680d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/fe09680d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/fe09680d Branch: refs/heads/NIFI-250 Commit: fe09680deaa76e9de7c962c98e50492173a1748e Parents: 4003542 85e38dc Author: Mark Payne <[email protected]> Authored: Wed Mar 11 15:48:04 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Wed Mar 11 15:48:04 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/cluster/manager/impl/WebClusterManager.java | 1 + .../src/main/java/org/apache/nifi/controller/FlowController.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe09680d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/fe09680d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowController.java ----------------------------------------------------------------------
