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/11/23 08:53:55 UTC

[incubator-plc4x] 04/04: Merge remote-tracking branch 'origin/develop' into develop

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

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git

commit 285f6009747950f538f7775611ecb73e5fe23242
Merge: 1d555bf b87edb1
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Nov 23 09:52:46 2018 +0100

    Merge remote-tracking branch 'origin/develop' into develop

 .../apache/plc4x/java/mock/PlcMockConnection.java  | 12 ++++++--
 plc4j/utils/opm/pom.xml                            | 11 +++----
 .../plc4x/java/opm/PlcEntityManagerTest.java       | 34 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 8 deletions(-)