You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/12/22 09:03:14 UTC

[incubator-streampipes-extensions] 07/14: Merge branch 'dev' into edge-extensions

This is an automated email from the ASF dual-hosted git repository.

wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git

commit a8c407468728a853a0cdf10702d0f29cac1f5590
Merge: 24fb875 7795050
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Tue Nov 24 10:35:57 2020 +0100

    Merge branch 'dev' into edge-extensions

 .idea/runConfigurations/connect_adapters.xml       |  2 +-
 pom.xml                                            |  5 ++
 streampipes-connect-adapters/pom.xml               |  4 ++
 .../streampipes/connect/ConnectAdapterInit.java    |  4 +-
 .../connect/adapters/netio/NetioUtils.java         |  2 +-
 .../connect/adapters/plc4x/s7/Plc4xS7Adapter.java  | 72 +++++++++++++---------
 .../streampipes/connect/config/ConfigKeys.java     |  4 +-
 .../connect/config/ConnectWorkerConfig.java        | 20 ++----
 8 files changed, 63 insertions(+), 50 deletions(-)