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

Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/11 19:43:52 UTC

[2/2] cayenne git commit: Merge branch '121'

Merge branch '121'


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

Branch: refs/heads/master
Commit: b67f8f1fca29ec520bff5ee883218b3286e30d04
Parents: 94dfec0 f5de1f2
Author: Savva Kolbachev <s....@gmail.com>
Authored: Fri Nov 11 22:08:44 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Fri Nov 11 22:08:44 2016 +0300

----------------------------------------------------------------------
 .../dbsync/merge/EntityMergeSupport.java        | 61 +++++++++++++++++++-
 1 file changed, 59 insertions(+), 2 deletions(-)
----------------------------------------------------------------------