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/01/19 13:49:07 UTC
[2/2] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/256' into asf-STABLE-4.0
Merge remote-tracking branch 'remotes/parent/pr/256' into asf-STABLE-4.0
# Conflicts:
# docs/doc/src/main/resources/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/f6ba5e14
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f6ba5e14
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f6ba5e14
Branch: refs/heads/STABLE-4.0
Commit: f6ba5e14d2143826a0f767fe7ae2917da395e6bb
Parents: ba14147 5adcec9
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Jan 19 16:48:55 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Jan 19 16:48:55 2018 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../org/apache/cayenne/modeler/action/DefaultActionManager.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f6ba5e14/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 2b8adbe,3d550eb..1524b5e
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -20,10 -20,7 +20,11 @@@ CAY-2365 SQLExec query tries to conver
CAY-2367 ClassCastException reading object with an attribute of type 'char'
CAY-2368 ColumnSelect: Property.self() translates into wrong SQL code
CAY-2370 ValueObjectType for byte[] fails lookup
-CAY-2392 Allow to remove dataNode in modeler
+CAY-2382 Lack of synchronization in DataContext serialization
+CAY-2387 Can't select byte[] property with ColumnSelect
+CAY-2388 Modeler: Visualization issues with undo/redo actions for attributes and relationships
+CAY-2389 DbEntity qualifier with DbPath expression translates into wrong SQL
++CAY-2392 Modeler: Unable to remove DataNode
----------------------------------
Release: 4.0.B2