Skip to content

Conversation

thinline72
Copy link
Member

Now our strategy is to always override DbEntities and ObjEntities.
Also fixed issue with error dialog.

@asfbot
Copy link

asfbot commented Dec 5, 2014

Cayenne pull requests #34 SUCCESS
This pull request looks good

@andrus
Copy link
Contributor

andrus commented Dec 9, 2014

@thinline72 : could you please try to rebase this change against the latest master code. DbLoader has changed after I applied another pull request from @AlexKolonitsky . So now this one doesn't merge cleanly.

Conflicts:
	cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
	modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
@asfbot
Copy link

asfbot commented Dec 10, 2014

Cayenne pull requests #38 SUCCESS
This pull request looks good

@asfgit asfgit merged commit 2a6ef00 into apache:master Dec 10, 2014
@thinline72 thinline72 deleted the CAY-1977_1 branch December 10, 2014 15:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants