cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [3/3] cayenne git commit: Merge remote-tracking branch 'remotes/parent/pr/243' into asf-master
Date Tue, 03 Oct 2017 09:00:41 GMT
Merge remote-tracking branch 'remotes/parent/pr/243' into asf-master


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/90327afa
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/90327afa
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/90327afa

Branch: refs/heads/master
Commit: 90327afa5676c7b4f454a70f2ab0a6494d074b07
Parents: bfada3f 6c871b3
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Tue Oct 3 11:58:40 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Tue Oct 3 11:58:40 2017 +0300

----------------------------------------------------------------------
 .../resources/templates/v4_1/singleclass.vm     | 35 ++++++++++----
 .../main/resources/templates/v4_1/superclass.vm | 34 ++++++++-----
 .../cayenne/access/OptimisticLockingIT.java     | 50 ++++++++++++--------
 .../batch/InsertBatchTranslatorIT.java          | 11 +++--
 .../locking/auto/_SimpleLockingTestEntity.java  | 41 ++++++++++++++++
 .../primitive/auto/_PrimitivesTestEntity.java   | 22 ++++++---
 .../src/test/resources/cayenne-locking.xml      |  2 +
 .../src/test/resources/cayenne-primitive.xml    |  2 +
 .../src/test/resources/locking.map.xml          |  4 ++
 .../src/test/resources/primitive.map.xml        |  2 +-
 .../cayenne/modeler/CodeTemplateManager.java    | 12 +++--
 11 files changed, 159 insertions(+), 56 deletions(-)
----------------------------------------------------------------------



Mime
View raw message