Merge branch 'develop' into NIFI-250
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ae3c29aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ae3c29aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ae3c29aa Branch: refs/heads/NIFI-250 Commit: ae3c29aa562f15b8af89afdeec15475a2dd96fb5 Parents: 4f41202 56cc186 Author: Matt Gilman <[email protected]> Authored: Thu Mar 12 06:50:16 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu Mar 12 06:50:16 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 +++---- .../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 +- 21 files changed, 924 insertions(+), 518 deletions(-) ----------------------------------------------------------------------
