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/4f01cd09 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/4f01cd09 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/4f01cd09 Branch: refs/heads/NIFI-250 Commit: 4f01cd090972fd6b2712d914e7d2ea8eca8627b1 Parents: 8bef904 91e002e Author: Matt Gilman <[email protected]> Authored: Thu Mar 26 06:55:03 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu Mar 26 06:55:03 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-assembly/pom.xml | 2 - .../org/apache/nifi/util/NiFiProperties.java | 2 - .../spring/WebClusterManagerFactoryBean.java | 7 --- ...ControllerServiceInstantiationException.java | 51 ++++++++++++++++++++ .../ControllerServiceNotFoundException.java | 51 -------------------- .../StandardControllerServiceProvider.java | 4 +- .../main/resources/conf/controller-services.xml | 18 ------- .../src/main/resources/conf/nifi.properties | 2 - .../src/main/resources/conf/reporting-tasks.xml | 49 ------------------- 9 files changed, 53 insertions(+), 133 deletions(-) ----------------------------------------------------------------------
