Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#1944] hibernate update to v4.2.19 #871

Merged
merged 5 commits into from
May 13, 2015

Conversation

xael-fry
Copy link
Member

No description provided.

xael-fry and others added 5 commits May 12, 2015 17:56
* refactor(JPAPlugin): move JPAModelLoader to its own file
disabled play's hibernate interceptor, giving back transitive persistence

Conflicts:
	framework/src/play/db/jpa/HibernateInterceptor.java
	framework/src/play/db/jpa/JPAPlugin.java
switch back to standard play save() behaviour

Conflicts:
	framework/src/play/db/jpa/HibernateInterceptor.java
	framework/src/play/db/jpa/JPAPlugin.java
* [#1944] refactor(HibernateInterceptor): fix tabulation in file

Conflicts:
	documentation/manual/configuration.textile
	framework/src/play/db/jpa/HibernateInterceptor.java
@xael-fry xael-fry force-pushed the 1944_hibernateUpdateMaster branch from ba9dbd7 to 2ce4af5 Compare May 12, 2015 10:14
@xael-fry xael-fry changed the title 1944 hibernate update master [#1944] hibernate update to v4.2.19 May 13, 2015
xael-fry added a commit that referenced this pull request May 13, 2015
@xael-fry xael-fry merged commit fbe5d8d into playframework:master May 13, 2015
@xael-fry xael-fry deleted the 1944_hibernateUpdateMaster branch May 13, 2015 00:49
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.

2 participants