Branch: refs/heads/64-8.12.x Home: https://github.com/teiid/teiid Commit: 22235fee310bc090f17e085c6608c7dcc5abd99a https://github.com/teiid/teiid/commit/22235fee310bc090f17e085c6608c7dcc5a... Author: jolee <jolee(a)redhat.com&gt; Date: 2017-05-17 (Wed, 17 May 2017) Changed paths: M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html M engine/src/main/java/org/teiid/query/processor/relational/DependentAccessNode.java M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java Log Message: ----------- TEIID-4722: TEIID30019: java.lang.AssertionError: Assertion failed assertion due to guard against a corner condition. (preventing an assertion error) Commit: 5b7ca632d185845e120e1ff2cd10a215bfa9209c https://github.com/teiid/teiid/commit/5b7ca632d185845e120e1ff2cd10a215bfa... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-05-18 (Thu, 18 May 2017) Changed paths: M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleConstants.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java A engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushLargeIn.java M engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java Log Message: ----------- Merge branch '64-8.12.x' of github.com:teiid/teiid into 64-8.12.x # Conflicts: # engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java Compare: https://github.com/teiid/teiid/compare/2829bc60c0e4...5b7ca632d185