Merge branch 'master' into NIFI-1156
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f8d26d20 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f8d26d20 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f8d26d20 Branch: refs/heads/NIFI-259 Commit: f8d26d205901d8cd782c02a5bc57e9ec66ee2f33 Parents: c82fc18 90f6830 Author: Jeremy Dyer <[email protected]> Authored: Fri Nov 13 15:02:23 2015 -0500 Committer: Jeremy Dyer <[email protected]> Committed: Fri Nov 13 15:02:23 2015 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/flowfile/FlowFile.java | 5 + .../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-kafka-processors/pom.xml | 5 + .../apache/nifi/processors/kafka/PutKafka.java | 712 +++++++++++++------ .../nifi/processors/kafka/TestPutKafka.java | 439 ++++++------ .../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 + 19 files changed, 1265 insertions(+), 685 deletions(-) ----------------------------------------------------------------------
