Merge branch 'develop' into prov-query-language
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/8783c114 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/8783c114 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/8783c114 Branch: refs/heads/prov-query-language Commit: 8783c114acf85b6bdb4cf79a45a159513539f97a Parents: 79c6001 7198912 Author: Mark Payne <[email protected]> Authored: Fri Mar 13 12:23:59 2015 -0400 Committer: Mark Payne <[email protected]> Committed: Fri Mar 13 12:23:59 2015 -0400 ---------------------------------------------------------------------- nifi/README.md | 6 +- nifi/nifi-assembly/LICENSE | 4 +- nifi/nifi-assembly/NOTICE | 27 ++ .../java/org/apache/nifi/bootstrap/RunNiFi.java | 16 +- .../nifi-site-to-site-client/pom.xml | 17 +- .../client/socket/EndpointConnectionPool.java | 1 - .../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 +- 25 files changed, 964 insertions(+), 529 deletions(-) ----------------------------------------------------------------------
