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/01/26 13:15:27 UTC

[13/14] 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/33cee9d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/33cee9d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/33cee9d7

Branch: refs/heads/NIFI-250
Commit: 33cee9d7651c7351714fd736a10803e00fc08f23
Parents: 2fb30c7 c4dffe2
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Jan 23 14:02:35 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Jan 23 14:02:35 2015 -0500

----------------------------------------------------------------------
 .../src/main/asciidoc/administration-guide.adoc | 307 +++++++++++++++++++
 .../nifi-processor-bundle-archetype/pom.xml     |  49 +++
 .../META-INF/maven/archetype-metadata.xml       |  43 +++
 .../nifi-__artifactBaseName__-nar/pom.xml       |  37 +++
 .../pom.xml                                     |  54 ++++
 .../src/main/java/MyProcessor.java              |  88 ++++++
 .../org.apache.nifi.processor.Processor         |  15 +
 .../docs/__package__.MyProcessor/index.html     |  96 ++++++
 .../src/test/java/MyProcessorTest.java          |  39 +++
 .../main/resources/archetype-resources/pom.xml  |  35 +++
 nifi/nifi-maven-archetypes/pom.xml              |  30 ++
 .../nifi/processors/standard/PostHTTP.java      |  34 +-
 .../index.html                                  |  20 ++
 .../index.html                                  |  21 ++
 nifi/pom.xml                                    |   1 +
 15 files changed, 857 insertions(+), 12 deletions(-)
----------------------------------------------------------------------