Branch: refs/heads/62-8.7.x Home: https://github.com/teiid/teiid Commit: a1fb6a1af382ba0047586d6a4aea4ac125b00650 https://github.com/teiid/teiid/commit/a1fb6a1af382ba0047586d6a4aea4ac125b... Author: jolee <jolee(a)redhat.com&gt; Date: 2016-04-26 (Tue, 26 Apr 2016) Changed paths: 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 nodecates are not always removed when UNION and GROUP BY clauses are used in a subquery (correcting the removal of the grouping node) Conflicts: engine/src/test/java/org/teiid/query/optimizer/TestUnionPlanning.java