Branch: refs/heads/63-8.12.x Home: https://github.com/teiid/teiid Commit: a702545639533e3bd809a07aef4eff48cb430d40 https://github.com/teiid/teiid/commit/a702545639533e3bd809a07aef4eff48cb4... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java M engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java Log Message: ----------- TEIID-4280 fixing deeply nested planning Conflicts: engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java Commit: d2bdb9db68c8b715eedc3cba39272cf45e78f4e0 https://github.com/teiid/teiid/commit/d2bdb9db68c8b715eedc3cba39272cf45e7... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-06-22 (Wed, 22 Jun 2016) Changed paths: M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java M engine/src/main/java/org/teiid/query/optimizer/relational/rules/FrameUtil.java M engine/src/main/java/org/teiid/query/sql/lang/WithQueryCommand.java M engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java Log Message: ----------- TEIID-4287 correcting recontexting of ctes Conflicts: engine/src/main/java/org/teiid/query/sql/lang/WithQueryCommand.java engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java Compare: https://github.com/teiid/teiid/compare/c0187ade3208...d2bdb9db68c8