[teiid-commits] [teiid/teiid] 2764ef: TEIID-3183 preventing the logic from over altering...

Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 2764ef0e89fc6691a645c0e045f118f61de06784 https://github.com/teiid/teiid/commit/2764ef0e89fc6691a645c0e045f118f61de... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java M engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java Log Message: ----------- TEIID-3183 preventing the logic from over altering the join order Commit: 1b170d68da2eeb9cf8381060bdf98bc9e1b00d8a https://github.com/teiid/teiid/commit/1b170d68da2eeb9cf8381060bdf98bc9e1b... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2014-10-21 (Tue, 21 Oct 2014) Changed paths: M client/src/main/java/org/teiid/gss/MakeGSS.java Log Message: ----------- Merge branch 'master' of https://github.com/teiid/teiid Compare: https://github.com/teiid/teiid/compare/0b85328f7f52...1b170d68da2e