You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/04/18 11:52:37 UTC
[2/2] cayenne git commit: Merge PR #288
Merge PR #288
# Conflicts:
# RELEASE-NOTES.txt
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cacea367
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cacea367
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cacea367
Branch: refs/heads/master
Commit: cacea3671977c4eb72e4c2ea80641b7ab48721de
Parents: faa8a2b 115bc00
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Apr 18 14:52:17 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Apr 18 14:52:17 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../modeler/action/DbEntitySyncAction.java | 54 +++++++++++---------
2 files changed, 31 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cacea367/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index 7cb5cb8,abc5802..424ddbe
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -53,7 -52,7 +53,8 @@@ CAY-2411 Wrong resolution of ExtendedTy
CAY-2418 Modeler: unable to edit entity selected via Search
CAY-2419 Modeler: Not changing highlight on selecting search results within one entity
CAY-2420 Modeler: search is not performed for Stored Procedures
+CAY-2425 Modeler: Migrate DB Direction field is locked if no option was selected in dropdown list
+ CAY-2427 Modeler: Undo throws exeption
----------------------------------
Release: 4.1.M1