Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/90f68300 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/90f68300 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/90f68300 Branch: refs/heads/NIFI-655 Commit: 90f6830003b76204e25dec9fafec2488c8bda550 Parents: 22de23b 36d00a6 Author: Mark Payne <[email protected]> Authored: Fri Nov 13 10:47:05 2015 -0500 Committer: Mark Payne <[email protected]> Committed: Fri Nov 13 10:47:05 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/flowfile/FlowFile.java | 5 + nifi-assembly/NOTICE | 7 + nifi-assembly/pom.xml | 5 + .../nifi-azure-bundle/nifi-azure-nar/pom.xml | 37 +++ .../src/main/resources/META-INF/NOTICE | 34 +++ .../nifi-azure-processors/pom.xml | 60 +++++ .../azure/eventhub/GetAzureEventHub.java | 254 +++++++++++++++++++ .../azure/eventhub/PutAzureEventHub.java | 186 ++++++++++++++ .../org.apache.nifi.processor.Processor | 16 ++ nifi-nar-bundles/nifi-azure-bundle/pom.xml | 35 +++ .../couchbase/AbstractCouchbaseProcessor.java | 109 ++++---- .../couchbase/CouchbaseExceptionMappings.java | 2 +- .../processors/couchbase/GetCouchbaseKey.java | 114 +++++---- .../processors/couchbase/PutCouchbaseKey.java | 76 +++--- .../couchbase/TestGetCouchbaseKey.java | 17 +- .../nifi/controller/StandardFlowFileQueue.java | 192 +++++++------- .../controller/TestStandardFlowFileQueue.java | 175 +++++++++++++ .../hadoop/AbstractHadoopProcessor.java | 2 +- .../nifi/processors/hadoop/FetchHDFS.java | 3 + .../apache/nifi/processors/hadoop/ListHDFS.java | 3 + .../nifi/processors/standard/ExecuteSQL.java | 8 +- .../nifi/processors/standard/PutSyslog.java | 1 + .../src/test/java/TestDynamicEnvironment.java | 29 +++ .../src/test/java/TestIngestAndUpdate.java | 34 +++ .../src/test/java/TestSuccess.java | 24 ++ nifi-nar-bundles/pom.xml | 7 +- pom.xml | 6 + 27 files changed, 1182 insertions(+), 259 deletions(-) ----------------------------------------------------------------------
