You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/01/24 20:13:11 UTC
[incubator-plc4x] 01/01: Merge branches
'feature/PLC4X-18--raw-sockets' and 'master' of
https://gitbox.apache.org/repos/asf/incubator-plc4x into
feature/PLC4X-18--raw-sockets
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/PLC4X-18--raw-sockets
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 04784d5aaf1aa365de6a85a58d8451defe3a4102
Merge: e746e70 f8fa7dc
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Jan 24 21:09:54 2018 +0100
Merge branches 'feature/PLC4X-18--raw-sockets' and 'master' of https://gitbox.apache.org/repos/asf/incubator-plc4x into feature/PLC4X-18--raw-sockets
applications/iotree/pom.xml | 2 --
applications/plclogger/pom.xml | 2 --
applications/pom.xml | 1 -
integrations/apache-brooklyn/pom.xml | 1 -
integrations/apache-camel/pom.xml | 2 --
integrations/apache-edgent/pom.xml | 2 --
.../apache/plc4x/edgent/mock/MockConnection.java | 1 -
integrations/apache-mynewt/pom.xml | 1 -
integrations/pom.xml | 1 -
plc4c/pom.xml | 1 -
plc4j/api/pom.xml | 2 --
.../api/exceptions/PlcConnectionException.java | 1 +
.../plc4x/java/api/exceptions/PlcException.java | 1 +
.../plc4x/java/api/exceptions/PlcIoException.java | 1 +
.../java/api/exceptions/PlcProtocolException.java | 1 +
plc4j/core/pom.xml | 2 --
plc4j/pom.xml | 1 -
plc4j/protocols/pom.xml | 1 -
plc4j/protocols/s7-utils/pom.xml | 2 --
plc4j/protocols/s7/pom.xml | 2 --
.../java/s7/netty/model/types/S7TypeTests.java | 8 +++---
plc4j/protocols/utils/pom.xml | 2 --
plc4s/pom.xml | 1 -
pom.xml | 31 +++++++++++++++++++++-
24 files changed, 38 insertions(+), 32 deletions(-)
--
To stop receiving notification emails like this one, please contact
cdutz@apache.org.