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 <and...@objectstyle.com> Authored: Tue Dec 6 10:32:42 2016 +0300 Committer: Andrus Adamchik <and...@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 ----------------------------------------------------------------------
