Merge branch 'develop' of https://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/0133f847 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0133f847 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0133f847 Branch: refs/heads/develop Commit: 0133f8471864efc0c316048b5a26e9d12351bab9 Parents: 1dc879c f665451 Author: Matt Gilman <[email protected]> Authored: Mon Feb 9 07:31:25 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Feb 9 07:31:25 2015 -0500 ---------------------------------------------------------------------- nifi/LICENSE | 25 +- nifi/nifi-assembly/LICENSE | 23 + nifi/nifi-docs/LICENSE | 235 +++++++++++ nifi/nifi-docs/NOTICE | 5 + nifi/nifi-docs/pom.xml | 30 +- .../src/main/asciidoc/asciidoc-mod.css | 418 +++++++++++++++++++ .../src/main/asciidoc/developer-guide.adoc | 32 +- .../src/main/assembly/dependencies.xml | 16 + nifi/pom.xml | 4 +- 9 files changed, 760 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
