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/07/27 07:03:37 UTC
[2/3] cayenne git commit: Merge branch '92'
Merge branch '92'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/c44ca2a2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/c44ca2a2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/c44ca2a2
Branch: refs/heads/master
Commit: c44ca2a22f4717c911355e67076c2de7906b1524
Parents: b1b2168 cdf40e3
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Wed Jul 27 09:52:24 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Wed Jul 27 09:52:24 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/map/DataMap.java | 11 +++++
.../apache/cayenne/util/EntityMergeSupport.java | 48 ++++++++++++++++----
.../ObjEntityAttributeRelationshipTab.java | 9 +++-
.../editor/ObjEntityRelationshipPanel.java | 7 +++
4 files changed, 64 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/c44ca2a2/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java
----------------------------------------------------------------------