Merge branch 'master' into NIFI-1343
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a915534e Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a915534e Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a915534e Branch: refs/heads/master Commit: a915534e23ff0955fcab2fc6cd017d45d5db5268 Parents: e16a9a0 336a7f5 Author: joewitt <[email protected]> Authored: Fri Jan 1 14:09:23 2016 -0500 Committer: joewitt <[email protected]> Committed: Fri Jan 1 14:09:23 2016 -0500 ---------------------------------------------------------------------- .../kafka/GetKafkaIntegrationTests.java | 170 ++++++++++++++ .../processors/kafka/test/EmbeddedKafka.java | 227 +++++++++++++++++++ .../kafka/test/EmbeddedKafkaProducerHelper.java | 110 +++++++++ .../src/test/resources/log4j.properties | 23 ++ .../src/test/resources/server.properties | 121 ++++++++++ .../src/test/resources/zookeeper.properties | 20 ++ 6 files changed, 671 insertions(+) ----------------------------------------------------------------------
