cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject [2/2] cayenne git commit: Merge branch '151'
Date Tue, 06 Dec 2016 07:33:14 GMT
Merge branch '151'


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

Branch: refs/heads/master
Commit: ca0ef28245a38f2174246146fd7ebfe2ba1e75a8
Parents: 6e92d71 0c20dca
Author: Andrus Adamchik <andrus@objectstyle.com>
Authored: Tue Dec 6 10:32:42 2016 +0300
Committer: Andrus Adamchik <andrus@objectstyle.com>
Committed: Tue Dec 6 10:32:42 2016 +0300

----------------------------------------------------------------------
 .../apache/cayenne/dbsync/merge/DbMerger.java   |  15 +--
 .../cayenne/dbsync/merge/TokenComparator.java   |  46 +++++++++
 .../cayenne/dbsync/merge/DbMergerTest.java      |  82 +++++++++++++++
 .../apache/cayenne/dbsync/merge/MergeCase.java  |   6 +-
 .../dbsync/merge/TokenComparatorTest.java       | 101 +++++++++++++++++++
 .../tools/dbimport/DefaultDbImportAction.java   |  19 +---
 .../dbimport/DefaultDbImportActionTest.java     |  10 +-
 docs/doc/src/main/resources/RELEASE-NOTES.txt   |   1 +
 .../db/MergerTokenSelectorController.java       |   2 +
 9 files changed, 246 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/ca0ef282/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------


Mime
View raw message