You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/03/10 07:27:23 UTC
[2/3] cayenne git commit: Merge branch 'pr/175' into asf-master
Merge branch 'pr/175' 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/c90bc93f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c90bc93f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c90bc93f
Branch: refs/heads/master
Commit: c90bc93f3324eec9295742caf91f3b503a378893
Parents: 458fb96 007dc27
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Mar 10 10:06:25 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Mar 10 10:06:25 2017 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/CayenneDataObject.java | 2 +-
.../cayenne/FlattenedRelationshipsIT.java | 47 ++++++++++++++++++--
.../relationships_flattened/FlattenedTest5.java | 7 +++
.../auto/_FlattenedTest1.java | 14 ++++++
.../auto/_FlattenedTest5.java | 38 ++++++++++++++++
.../resources/relationships-flattened.map.xml | 26 +++++++++++
6 files changed, 129 insertions(+), 5 deletions(-)
----------------------------------------------------------------------