[hibernate-commits] [hibernate/hibernate-orm] 6a9a7f: HHH-4150 - Fix and test

[GitHub]

  Branch: refs/heads/4.1
  Home:   https://github.com/hibernate/hibernate-orm
  Commit: 6a9a7f1b66737058406906c7853e55c7bffcacf2
      https://github.com/hibernate/hibernate-orm/commit/6a9a7f1b66737058406906c7853e55c7bffcacf2
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M hibernate-core/src/main/antlr/hql.g
    M hibernate-core/src/test/java/org/hibernate/test/hql/ASTParserLoadingTest.java

  Log Message:
  -----------
  HHH-4150 - Fix and test

Conflicts:
	hibernate-core/src/main/antlr/hql.g


  Commit: f41434296b1a1d34e971cffa1f08591d72e9f1ea
      https://github.com/hibernate/hibernate-orm/commit/f41434296b1a1d34e971cffa1f08591d72e9f1ea
  Author: Lukasz Antoniak <lukasz.antoniak at gmail.com>
  Date:   2013-02-19 (Tue, 19 Feb 2013)

  Changed paths:
    M hibernate-core/src/main/java/org/hibernate/sql/ordering/antlr/OrderByFragmentParser.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Box.java
    A hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/Item.java
    M hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java

  Log Message:
  -----------
  HHH-7608 - Fix and test

Conflicts:
	hibernate-core/src/test/java/org/hibernate/test/annotations/onetomany/OrderByTest.java


Compare: https://github.com/hibernate/hibernate-orm/compare/38162cac45ed...f41434296b1a