Merge branch 'NIFI-735' 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/9fa03b43 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9fa03b43 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9fa03b43 Branch: refs/heads/master Commit: 9fa03b43245cfba27fe084ac46b44f39856dbcbb Parents: 0d2842e c769742 Author: danbress <dbr...@onyxconsults.com> Authored: Mon Jul 6 20:25:54 2015 -0400 Committer: danbress <dbr...@onyxconsults.com> Committed: Mon Jul 6 20:25:54 2015 -0400 ---------------------------------------------------------------------- .../documentation/ConfigurableComponentInitializer.java | 9 ++++++++- .../java/org/apache/nifi/documentation/DocGenerator.java | 2 ++ .../documentation/init/ControllerServiceInitializer.java | 11 ++++++++--- .../nifi/documentation/init/ProcessorInitializer.java | 11 ++++++++--- .../documentation/init/ReportingTaskingInitializer.java | 11 ++++++++--- .../documentation/html/HtmlDocumentationWriterTest.java | 10 ++++++---- .../html/ProcessorDocumentationWriterTest.java | 7 +++++-- 7 files changed, 45 insertions(+), 16 deletions(-) ----------------------------------------------------------------------