Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 83509c9b34299c2fac34e4be9561f6ae36f5fec6 https://github.com/teiid/teiid/commit/83509c9b34299c2fac34e4be9561f6ae36f... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-07-26 (Sat, 26 Jul 2014) Changed paths: M client/src/main/java/org/teiid/jdbc/ConnectionImpl.java M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java Log Message: ----------- TEIID-3049 fix for odbc disabled local txn commit Conflicts: test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java