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/30 08:26:27 UTC
[3/3] cayenne git commit: Merge branch '143'
Merge branch '143'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/52acbefc
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/52acbefc
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/52acbefc
Branch: refs/heads/master
Commit: 52acbefcbf931ab83ad19add8451f6760dba2cec
Parents: 66d44c2 ba17f22
Author: Savva Kolbachev <s....@gmail.com>
Authored: Wed Nov 30 11:25:53 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Wed Nov 30 11:25:53 2016 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/merge/CreateTableToDb.java | 30 ++++++++--
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/action/MigrateAction.java | 27 +++++++--
.../dialog/db/DbMigrateOptionsDialog.java | 61 +++++++++++++++-----
.../modeler/dialog/db/MergerOptions.java | 25 ++------
5 files changed, 98 insertions(+), 46 deletions(-)
----------------------------------------------------------------------