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/11/15 11:09:57 UTC

[3/3] cayenne git commit: Merge PR #345

Merge PR #345


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/8523da7d
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/8523da7d
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/8523da7d

Branch: refs/heads/master
Commit: 8523da7dfda429ac72f5c47d8022b18c857def04
Parents: a42bcd7 dd9bf2e
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu Nov 15 14:09:38 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu Nov 15 14:09:38 2018 +0300

----------------------------------------------------------------------
 RELEASE-NOTES.txt                                              | 1 +
 .../cayenne/dbsync/reverse/dbimport/ReverseEngineering.java    | 2 +-
 .../main/java/org/apache/cayenne/dbsync/xml/ConfigHandler.java | 6 +++++-
 .../org/apache/cayenne/dbsync/xml/DbImportLoaderDelegate.java  | 2 +-
 .../main/resources/org/apache/cayenne/schema/10/dbimport.xsd   | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/8523da7d/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index d701e29,4f11513..db5c6fe
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -25,7 -25,7 +25,8 @@@ CAY-2485 Compact Slf4j Logge
  CAY-2487 Removed usage of CayenneException.
  CAY-2489 Add validation to the case of not to PK relationships
  CAY-2491 Remaster Db Import View
 +CAY-2493 Save cgen configuration with datamap XML
+ CAY-2494 Rename dbImport tag from 'config' to 'dbImport'
  
  Bug Fixes: