Branch: refs/heads/64-8.12.x Home: https://github.com/teiid/teiid Commit: a8add15ed64341c72f1abf736c2a9a4344071b79 https://github.com/teiid/teiid/commit/a8add15ed64341c72f1abf736c2a9a43440... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-11-22 (Wed, 22 Nov 2017) Changed paths: M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java Log Message: ----------- TEIID-4290 changing savepoint rollback to be a no op Conflicts: runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java # Conflicts: # test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java