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:54:51 UTC
[2/2] cayenne git commit: Merge branch '141'
Merge branch '141'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/31f82825
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/31f82825
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/31f82825
Branch: refs/heads/master
Commit: 31f8282588d901e8266b163058f099fcdf3c0589
Parents: 00b8d32 bd52236
Author: Savva Kolbachev <s....@gmail.com>
Authored: Thu Nov 24 17:54:41 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Nov 24 17:54:41 2016 +0300
----------------------------------------------------------------------
.../validation/ObjAttributeValidator.java | 200 +++++++++----------
.../org/apache/cayenne/map/ObjAttribute.java | 4 +-
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../modeler/dialog/db/DbLoaderHelper.java | 2 +
.../editor/wrapper/ObjAttributeWrapper.java | 7 +-
5 files changed, 109 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/31f82825/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 7898cc9,61a7bcd..3fdd625
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -69,8 -69,7 +69,9 @@@ 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
+ CAY-2153 Modeler Exception in save action after reverse engineering some complex DB schema
----------------------------------
Release: 4.0.M3