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

Posted to jdo-commits@db.apache.org by mb...@apache.org on 2019/04/25 17:12:44 UTC

[db-jdo] 01/01: Merge remote-tracking branch 'origin/master' into JDO-652

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

mbo pushed a commit to branch JDO-652
in repository https://gitbox.apache.org/repos/asf/db-jdo.git

commit 8d38174b6652f5fd6b92e410f84b9e6d6ab1bc8a
Merge: 4862e49 d23c2c1
Author: Michael Bouschen <mb...@apache.org>
AuthorDate: Thu Apr 25 19:12:27 2019 +0200

    Merge remote-tracking branch 'origin/master' into JDO-652
    
    # Conflicts:
    #	tck/pom.xml

 api/src/main/java/javax/jdo/JDOQLTypedQuery.java | 36 +++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)