You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2014/12/29 22:18:00 UTC
[3/4] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
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 <ma...@hotmail.com>
Authored: Mon Dec 29 11:02:36 2014 -0500
Committer: Mark Payne <ma...@hotmail.com>
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(-)
----------------------------------------------------------------------