Merge PR #299
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/39326db2 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/39326db2 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/39326db2 Branch: refs/heads/STABLE-4.0 Commit: 39326db2d2b2b7c466390aa5a02f00008622918b Parents: 7077ed0 c77c851 Author: Nikita Timofeev <stari...@gmail.com> Authored: Tue Jul 10 11:22:21 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Tue Jul 10 11:22:21 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../cayenne/modeler/editor/ObjEntityRelationshipPanel.java | 4 ++-- .../modeler/editor/dbentity/DbEntityRelationshipPanel.java | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/39326db2/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc RELEASE-NOTES.txt index 8599c3b,df6328f..4c2ec13 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -46,8 -46,8 +46,9 @@@ CAY-2392 Modeler: Unable to remove Data CAY-2401 Modeler: NPE in ObjEntity sync action CAY-2405 Broken prefetch of entity with inheritance and attribute with custom java type CAY-2411 Wrong resolution of ExtendedType with ValueObjectType for inherited class + CAY-2418 Modeler: unable to edit entity selected via Search CAY-2420 Modeler: search is not performed for Stored Procedures +CAY-2427 Modeler: Undo throws exeption CAY-2429 Generate classes: Invalid template type: EMBEDDABLE_SINGLE_CLASS ----------------------------------
