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/40890c9a Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/40890c9a Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/40890c9a Branch: refs/heads/develop Commit: 40890c9aeca86d3bed5a29d7387bc16c83f2c413 Parents: c69e4db 87b0738 Author: Mark Payne <[email protected]> Authored: Mon Dec 29 11:02:36 2014 -0500 Committer: Mark Payne <[email protected]> Committed: Mon Dec 29 11:02:36 2014 -0500 ---------------------------------------------------------------------- .../src/main/asciidoc/administration-guide.adoc | 2 + .../src/main/asciidoc/developer-guide.adoc | 2 + nifi-docs/src/main/asciidoc/overview.adoc | 122 +++++++++++++++++-- nifi-docs/src/main/asciidoc/user-guide.adoc | 2 + pom.xml | 5 +- 5 files changed, 120 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
