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/03/27 14:05:26 UTC
[3/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/263' into asf-master
Merge remote-tracking branch 'remotes/parent/pr/263' into asf-master
# 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/85316fd2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/85316fd2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/85316fd2
Branch: refs/heads/master
Commit: 85316fd29ead42f527f0d0f6f12004582ae79fd3
Parents: bddc400 0a05318
Author: Nikita Timofeev <st...@gmail.com>
Authored: Tue Mar 27 16:58:34 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Tue Mar 27 16:58:34 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 1 +
.../server/DBCPDataSourceFactory.java | 2 ++
.../editor/datanode/MainDataNodeEditor.java | 3 +-
.../editor/datanode/MainDataNodeView.java | 32 ++++++++++++++------
5 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/85316fd2/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index acdd968,57bf788..a8787a0
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -21,14 -20,7 +21,15 @@@ CAY-2393 Add sqlserver-docker profile t
CAY-2394 Upgrade to Apache Velocity 2.0
CAY-2395 cdbimport: add option to create project file
CAY-2396 Upgrade maven-assembly-plugin to 3.1.0
-CAY-2400 Cayenne-DBCP2 was deprecated
+CAY-2398 Deprecate cayenne-joda
++CAY-2400 Deprecate cayenne-dbcp2
+CAY-2403 Extract eventbridges to top level
+CAY-2404 Move itests to maven-plugins
+CAY-2406 Add prefetch-related API to SQLSelect
+CAY-2407 Modeler: add prefetch support for the SQLTemplate query
+CAY-2410 Add prefetch type support for SQLTemplate query and SelectQuery
+CAY-2414 Modeler: new icon design
+CAY-2415 Transaction isolation and propagation support
Bug Fixes: