[hibernate-commits] [hibernate/hibernate-orm] 534836: fixing test failures in the merge

[GitHub]

  Branch: refs/heads/metamodel
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 53483676652e1f6f97c86ce6d3ed573a55118876
      https://github.com/hibernate/hibernate-orm/commit/53483676652e1f6f97c86ce6d3ed573a55118876
  Author: Strong Liu <stliu at hibernate.org>
  Date:   2013-03-20 (Wed, 20 Mar 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/jpa/metamodel/internal/legacy/AbstractManagedType.java
    M hibernate-entitymanager/src/main/java/org/hibernate/jpa/boot/internal/EntityManagerFactoryBuilderImpl.java

  Log Message:
  -----------
  fixing test failures in the merge