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/13 15:47:22 UTC
[05/11] incubator-nifi git commit: Merge branch 'NIFI-414' of
https://github.com/jamespowenjr/incubator-nifi into develop
Merge branch 'NIFI-414' of https://github.com/jamespowenjr/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/e63268af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e63268af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e63268af
Branch: refs/heads/NIFI-250
Commit: e63268af04b131a4a216b15736a221762476ce20
Parents: 053d29d 5450a5a
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Mar 12 15:43:35 2015 -0400
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Mar 12 15:43:35 2015 -0400
----------------------------------------------------------------------
nifi/nifi-assembly/LICENSE | 4 +-
nifi/nifi-assembly/NOTICE | 27 ++
.../nifi-site-to-site-client/pom.xml | 17 +-
.../nifi/processors/hadoop/KeyValueReader.java | 16 +-
.../nifi/processors/hadoop/ValueReader.java | 16 +-
.../nifi-kite-bundle/nifi-kite-nar/pom.xml | 82 +++---
.../src/main/resources/META-INF/LICENSE | 240 +++++++++++++++
.../src/main/resources/META-INF/NOTICE | 78 +++++
.../nifi-kite-processors/pom.xml | 291 +++++++++---------
.../processors/kite/AbstractKiteProcessor.java | 295 +++++++++----------
.../apache/nifi/processors/kite/AvroUtil.java | 3 -
.../nifi/processors/kite/ConvertCSVToAvro.java | 9 +-
.../nifi/processors/kite/ConvertJSONToAvro.java | 192 ++++++------
.../processors/kite/StoreInKiteDataset.java | 6 +-
nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 99 +++----
.../nifi/processors/standard/PutEmail.java | 28 +-
.../index.html | 2 +-
.../org/apache/tika/mime/custom-mimetypes.xml | 14 +
.../nifi-http-context-map-api/pom.xml | 14 +
.../src/main/resources/META-INF/NOTICE | 19 ++
...org.apache.nifi.controller.ControllerService | 16 +-
nifi/pom.xml | 2 +-
22 files changed, 946 insertions(+), 524 deletions(-)
----------------------------------------------------------------------