Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/3125036d Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/3125036d Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/3125036d Branch: refs/heads/master Commit: 3125036d3f463c97a10466d244952f10f0054b64 Parents: c0f1104 9fa03b4 Author: Mark Payne <marka...@hotmail.com> Authored: Tue Jul 7 21:08:34 2015 -0400 Committer: Mark Payne <marka...@hotmail.com> Committed: Tue Jul 7 21:08:34 2015 -0400 ---------------------------------------------------------------------- nifi/nifi-external/nifi-storm-spout/pom.xml | 2 +- .../java/org/apache/nifi/storm/NiFiSpout.java | 38 ++++++++++++++++++-- .../ConfigurableComponentInitializer.java | 9 ++++- .../apache/nifi/documentation/DocGenerator.java | 2 ++ .../init/ControllerServiceInitializer.java | 11 ++++-- .../init/ProcessorInitializer.java | 11 ++++-- .../init/ReportingTaskingInitializer.java | 11 ++++-- .../html/HtmlDocumentationWriterTest.java | 10 +++--- .../html/ProcessorDocumentationWriterTest.java | 7 ++-- 9 files changed, 82 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
