cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skolbac...@apache.org
Subject [8/9] cayenne git commit: Merge branch 'master' into modeler-reverseengineering-added-relation-fix
Date Wed, 16 Nov 2016 18:46:03 GMT
Merge branch 'master' into modeler-reverseengineering-added-relation-fix

# Conflicts:
#	modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java


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

Branch: refs/heads/master
Commit: 1462b2db3c6127615fee1dc9b0f3540462000517
Parents: 8c5985e
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Tue Nov 15 10:44:56 2016 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Tue Nov 15 10:44:56 2016 +0300

----------------------------------------------------------------------
 .../java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/1462b2db/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
index 344215d..3709aae 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/MergerOptions.java
@@ -20,8 +20,7 @@
 package org.apache.cayenne.modeler.dialog.db;
 
 import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.configuration.event.DataMapEvent;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.dbsync.merge.AbstractToDbToken;
 import org.apache.cayenne.dbsync.merge.DbMerger;


Mime
View raw message