Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 793d07b4f2633ec41c9417f1766da5b2a822b792 https://github.com/teiid/teiid/commit/793d07b4f2633ec41c9417f1766da5b2a82... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2013-02-06 (Wed, 06 Feb 2013) Changed paths: M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java Log Message: ----------- TEIID-2380 adding a fix for update compensation