Branch: refs/heads/8.11.x Home: https://github.com/teiid/teiid Commit: 21be3eadd61a3119890d222351d313774bf7ea82 https://github.com/teiid/teiid/commit/21be3eadd61a3119890d222351d313774bf... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-10-15 (Thu, 15 Oct 2015) Changed paths: M api/src/main/java/org/teiid/language/AggregateFunction.java M api/src/main/java/org/teiid/language/visitor/HierarchyVisitor.java M api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java M engine/src/main/java/org/teiid/dqp/internal/datamgr/LanguageBridgeFactory.java M engine/src/main/java/org/teiid/dqp/internal/process/Request.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java Log Message: ----------- TEIID-3756 accounting for aggregate ordering pushdown Conflicts: engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java