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 15:03:31 UTC
[2/2] cayenne git commit: Merge branch '142'
Merge branch '142'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1b56fe6f
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1b56fe6f
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1b56fe6f
Branch: refs/heads/master
Commit: 1b56fe6f6781889691852d68314d80a5d9af8d32
Parents: 31f8282 8e5dab5
Author: Savva Kolbachev <s....@gmail.com>
Authored: Thu Nov 24 18:03:20 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Thu Nov 24 18:03:20 2016 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/dbsync/merge/AddColumnToDb.java | 9 +++++++++
.../org/apache/cayenne/dbsync/merge/DropColumnToDb.java | 9 +++++++++
.../apache/cayenne/dbsync/merge/DropRelationshipToDb.java | 9 +++++++++
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
4 files changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/1b56fe6f/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 3fdd625,c323880..5dbdc64
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -69,9 -69,7 +69,10 @@@ 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
+ CAY-2154 Migrate db: queries order
----------------------------------
Release: 4.0.M3