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 12:28:14 UTC
[5/5] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/254' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/254' into asf-master
# 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/84687a78
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/84687a78
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/84687a78
Branch: refs/heads/master
Commit: 84687a7874b4cf0107809d0feea82c394a826b46
Parents: 8d66f55 8f67218
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Jan 19 15:27:37 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Jan 19 15:27:37 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/84687a78/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index f64ec84,871929d..4b6d894
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -27,6 -26,6 +27,7 @@@ CAY-2382 Lack of synchronization in Dat
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.1.M1