You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/08/05 18:34:49 UTC
[3/3] cayenne git commit: Merge branch 'master' into modeler_fixes
Merge branch 'master' into modeler_fixes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/3591c262
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/3591c262
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/3591c262
Branch: refs/heads/master
Commit: 3591c2626b61357f0b3f589ab69265bda312ef9f
Parents: bc4f9a3 697f38e
Author: Maik Musall <ma...@selbstdenker.ag>
Authored: Fri Aug 5 15:58:08 2016 +0200
Committer: Maik Musall <ma...@selbstdenker.ag>
Committed: Fri Aug 5 15:58:08 2016 +0200
----------------------------------------------------------------------
.../cayenne/access/DataDomainDBDiffBuilder.java | 33 ++++++------
.../cayenne/access/VerticalInheritanceIT.java | 30 ++++++++---
.../apache/cayenne/map/ObjRelationshipIT.java | 2 +-
.../testdo/inheritance_vertical/IvAbstract.java | 9 ++++
.../testdo/inheritance_vertical/IvConcrete.java | 9 ++++
.../inheritance_vertical/auto/_Iv1Root.java | 15 +++---
.../inheritance_vertical/auto/_Iv1Sub1.java | 9 ++--
.../inheritance_vertical/auto/_Iv2Root.java | 9 ++--
.../inheritance_vertical/auto/_Iv2Sub1.java | 9 ++--
.../testdo/inheritance_vertical/auto/_Iv2X.java | 2 +
.../inheritance_vertical/auto/_IvAbstract.java | 27 ++++++++++
.../inheritance_vertical/auto/_IvConcrete.java | 53 ++++++++++++++++++++
.../inheritance_vertical/auto/_IvRoot.java | 15 +++---
.../inheritance_vertical/auto/_IvSub1.java | 9 ++--
.../inheritance_vertical/auto/_IvSub1Sub1.java | 9 ++--
.../inheritance_vertical/auto/_IvSub2.java | 15 +++---
.../test/resources/inheritance-vertical.map.xml | 32 +++++++++++-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
18 files changed, 226 insertions(+), 62 deletions(-)
----------------------------------------------------------------------