Branch: refs/heads/8.11.x Home: https://github.com/teiid/teiid Commit: 4c45cdca1d987dd744fd4adf3337a84aa26c9ef7 https://github.com/teiid/teiid/commit/4c45cdca1d987dd744fd4adf3337a84aa26... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-10-19 (Mon, 19 Oct 2015) Changed paths: M engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java M engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java M engine/src/main/resources/org/teiid/query/i18n.properties M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java Log Message: ----------- TEIID-3777 updating the aggregate distinct/orderby logic Conflicts: engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java