You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ab...@apache.org on 2019/09/23 00:34:52 UTC
[nifi-minifi-cpp] 01/02: Merge remote-tracking branch
'apache/master'
This is an automated email from the ASF dual-hosted git repository.
aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit 8e40c3fa29d82a89efc995eb0615afd8a7fd92f7
Merge: decf568 86d5d3f
Author: Arpad Boda <ar...@gmail.com>
AuthorDate: Mon Sep 23 00:32:29 2019 +0000
Merge remote-tracking branch 'apache/master'
CMakeLists.txt | 2 +
conf/minifi-log.properties | 2 +
docker/ContainerBuild.sh | 4 +
docker/centos/Dockerfile | 2 +-
docker/test/integration/minifi/__init__.py | 18 +-
docker/test/integration/minifi/test/__init__.py | 53 +++++-
...{test_zero_file.py => test_filter_zero_file.py} | 7 +-
docker/test/integration/test_zero_file.py | 5 +-
extensions/civetweb/CMakeLists.txt | 1 +
extensions/civetweb/processors/ListenHTTP.cpp | 22 +--
extensions/civetweb/tests/ListenHTTPTests.cpp | 3 +-
extensions/http-curl/HTTPCurlLoader.h | 2 +-
extensions/http-curl/client/HTTPClient.cpp | 1 +
extensions/http-curl/protocols/RESTReceiver.cpp | 2 +-
extensions/http-curl/sitetosite/HTTPProtocol.cpp | 58 +++---
extensions/http-curl/tests/TestServer.h | 2 +-
extensions/librdkafka/CMakeLists.txt | 1 +
extensions/opencv/FrameIO.h | 77 ++++++++
extensions/opencv/MotionDetector.cpp | 203 +++++++++++++++++++++
extensions/opencv/MotionDetector.h | 88 +++++++++
extensions/opencv/tests/CaptureRTSPFrameTest.cpp | 5 +-
libminifi/include/Connection.h | 10 +
libminifi/include/RemoteProcessorGroupPort.h | 2 +-
.../include/core/logging/LoggerConfiguration.h | 33 +++-
libminifi/include/utils/ClassUtils.h | 44 +++++
libminifi/include/utils/HTTPClient.h | 4 +-
libminifi/include/utils/StringUtils.h | 3 +-
libminifi/src/Connection.cpp | 8 +
libminifi/src/core/FlowConfiguration.cpp | 2 +-
libminifi/src/core/logging/LoggerConfiguration.cpp | 15 ++
libminifi/src/core/yaml/YamlConfiguration.cpp | 8 +
libminifi/src/sitetosite/RawSocketProtocol.cpp | 6 +-
libminifi/src/sitetosite/SiteToSiteClient.cpp | 64 ++++---
libminifi/src/utils/ClassUtils.cpp | 58 ++++++
libminifi/src/utils/HTTPClient.cpp | 68 +++----
libminifi/test/TestBase.h | 92 ++++++++--
libminifi/test/unit/ClassUtilsTests.cpp | 61 +++++++
libminifi/test/unit/HTTPUtilTests.cpp | 67 +++++++
libminifi/test/unit/LoggerTests.cpp | 36 +++-
39 files changed, 962 insertions(+), 177 deletions(-)