You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@nifi.apache.org by mc...@apache.org on 2015/03/04 15:30:14 UTC

[21/50] incubator-nifi git commit: Merge branch 'develop' of http://git-wip-us.apache.org/repos/asf/incubator-nifi into develop

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/50744bfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/50744bfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/50744bfd

Branch: refs/heads/NIFI-376
Commit: 50744bfdc608c2395b7af281a587d241356e699c
Parents: 97aa53d 4ac6dfd
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Feb 25 14:35:45 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Wed Feb 25 14:35:45 2015 -0500

----------------------------------------------------------------------
 .../src/main/asciidoc/administration-guide.adoc | 43 ++++++++++++++------
 nifi/nifi-docs/src/main/asciidoc/overview.adoc  |  4 +-
 .../nifi-docs/src/main/asciidoc/user-guide.adoc | 11 +++++
 3 files changed, 44 insertions(+), 14 deletions(-)
----------------------------------------------------------------------