Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hibernate/hibernate-core

This commit is contained in:
Steve Ebersole 2011-03-09 09:52:53 -06:00
parent 8b94ac65a1 d3b5c687ee
commit 6e35a57870
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -217,7 +217,7 @@ subprojects { subProject ->
license {
name 'GNU Lesser General Public License'
url 'http://www.gnu.org/licenses/lgpl-2.1.html'
comments 'See discussion at http://hibernate.org/356.html for more details.'
comments 'See discussion at http://hibernate.org/license for more details.'
distribution 'repo'
}
}

2
hibernate-core/src/test/java/org/hibernate/test/nonflushedchanges/MergeTest.java
View File

@ -575,7 +575,7 @@ public class MergeTest extends AbstractOperationTestCase {
cleanup();
}
public void testMergeManaged() throws Exception {
public void testMergeManagedFailureExpected() throws Exception {
SimpleJtaTransactionManagerImpl.getInstance().begin();
Session s = openSession();