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 2015/01/06 16:17:35 UTC

[6/7] incubator-nifi git commit: Merge branch 'NIFI-220' into develop

Merge branch 'NIFI-220' 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/0b25df49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/0b25df49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/0b25df49

Branch: refs/heads/develop
Commit: 0b25df490b3c517a5b7d9c89cefe16a6173b2e16
Parents: b1e5c5e c91c7e7
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Jan 5 20:33:32 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Jan 5 20:33:32 2015 -0500

----------------------------------------------------------------------
 assembly/pom.xml                                |   5 +
 nar-bundles/kafka-bundle/kafka-nar/pom.xml      |  37 ++
 .../kafka-bundle/kafka-processors/pom.xml       |  76 ++++
 .../apache/nifi/processors/kafka/GetKafka.java  | 314 ++++++++++++++
 .../apache/nifi/processors/kafka/PutKafka.java  | 415 +++++++++++++++++++
 .../org.apache.nifi.processor.Processor         |   2 +
 .../index.html                                  | 173 ++++++++
 .../index.html                                  | 189 +++++++++
 .../nifi/processors/kafka/TestGetKafka.java     | 162 ++++++++
 .../nifi/processors/kafka/TestPutKafka.java     | 220 ++++++++++
 nar-bundles/kafka-bundle/pom.xml                |  35 ++
 pom.xml                                         |   6 +
 12 files changed, 1634 insertions(+)
----------------------------------------------------------------------