You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/24 14:47:15 UTC
[2/2] cayenne git commit: Merge branch '140'
Merge branch '140'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/00b8d320
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/00b8d320
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/00b8d320
Branch: refs/heads/master
Commit: 00b8d32046a68c6880e1c55f998d0e162fa9a809
Parents: ac1c8c5 7cfd286
Author: Savva Kolbachev <s....@gmail.com>
Authored: Thu Nov 24 17:46:56 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Nov 24 17:46:56 2016 +0300
----------------------------------------------------------------------
.../project/upgrade/v8/UpgradeHandler_V8.java | 3 +++
.../java/org/apache/cayenne/map/MapLoader.java | 8 ++++--
.../cayenne/map/QueryDescriptorLoader.java | 26 ++++++++++++++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
4 files changed, 36 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/00b8d320/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 3eddba9,de69496..7898cc9
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -69,7 -69,7 +69,8 @@@ CAY-2131 Modeler NullPointerException i
CAY-2138 NVARCHAR, LONGNVARCHAR and NCLOB types are missing from Firebird types.xml
CAY-2143 NPE in BaseSchemaUpdateStrategy
CAY-2144 cdbimport always fails for databases which don't support catalogs
+ CAY-2148 Failure upgrading from 3.1 to M4
+CAY-2150 UI bug: PK generation custom sequence is getting reset
----------------------------------
Release: 4.0.M3