[hibernate-commits] [hibernate/hibernate-core] 6e7165: HHH-6211 - Fix bad pull request merge

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/hibernate/hibernate-core

Commit: 6e716573313271ba77c5a608f9977730fad90b03
    https://github.com/hibernate/hibernate-core/commit/6e716573313271ba77c5a608f9977730fad90b03
Author: Steve Ebersole <steve at hibernate.org>
Date:   2011-05-09 (Mon, 09 May 2011)

Changed paths:
  M hibernate-ehcache/hibernate-ehcache.gradle

Log Message:
-----------
HHH-6211 - Fix bad pull request merge


Commit: 66a641df055432b4db45fc0400578717acfcbabd
    https://github.com/hibernate/hibernate-core/commit/66a641df055432b4db45fc0400578717acfcbabd
Author: Steve Ebersole <steve at hibernate.org>
Date:   2011-05-09 (Mon, 09 May 2011)

Changed paths:
  M hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java
  M hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java

Log Message:
-----------
HHH-6211 - Fix bad pull request merge


Compare: https://github.com/hibernate/hibernate-core/compare/0408836...66a641d