This is an automated email from the ASF dual-hosted git repository. keinmark pushed a commit to branch PLC4X-12 in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit fefa5952d3dcd55b1dcb1384bfbe0785231159ba Merge: 2f70356 bf90e53 Author: Mark Keinhörster <[email protected]> AuthorDate: Sun Jan 14 18:29:51 2018 +0100 Merge branch 'master' into PLC4X-12 .../plc4x/java/api/messages/items/RequestItem.java | 11 ---------- .../java/isoontcp/netty/IsoOnTcpProtocol.java | 4 +++- .../plc4x/java/isotp/netty/IsoTPProtocol.java | 25 +++++++++++++++------- .../java/isotp/netty/model/tpdus/CustomTpdu.java | 15 +++++++++++++ .../java/isotp/netty/model/types/TpduCode.java | 8 +++++-- .../org/apache/plc4x/java/s7/netty/S7Protocol.java | 8 +++++-- .../netty/model/types/DataTransportErrorCode.java | 9 ++++++-- .../java/s7/netty/model/types/ParameterType.java | 7 +++++- .../plc4x/java/isotp/netty/IsoTPProtocolTest.java | 22 +++++++++++++++++++ .../isotp/netty/model/types/IsotpTypeTests.java | 5 +++-- 10 files changed, 85 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
