Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 78722981cfcb73932801ca13c05358bdb2f427b4 https://github.com/teiid/teiid/commit/78722981cfcb73932801ca13c05358bdb2f... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-09-22 (Tue, 22 Sep 2015) Changed paths: M build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java M engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java Log Message: ----------- TEIID-3696: correcting the removal of the grouping node Conflicts: engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java