Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 36461515904c053e75ee4a518b03a3a8d868fc91 https://github.com/teiid/teiid/commit/36461515904c053e75ee4a518b03a3a8d86... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2016-06-02 (Thu, 02 Jun 2016) Changed paths: M engine/src/main/java/org/teiid/security/GSSResult.java M jboss-integration/src/main/java/org/teiid/jboss/JBossSecurityHelper.java M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java Log Message: ----------- TEIID-3803: avoid sending the dummy service token to the client. This does not work in Windows ODBC scenario Commit: f86dfc407bc74ce858302d347db9bc389fb6e64e https://github.com/teiid/teiid/commit/f86dfc407bc74ce858302d347db9bc389fb... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-06-02 (Thu, 02 Jun 2016) Changed paths: M build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java M engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java Log Message: ----------- BZ1267577: DV_6.1 Update 05 + TEIID-3818 + TEIID-3803 + TEIID-4237 Conflicts: engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java Compare: https://github.com/teiid/teiid/compare/ee249d4c4628...f86dfc407bc7