Branch: refs/heads/11.2.x Home: https://github.com/teiid/teiid Commit: 14d866d1c3ee1e3d573e714ee3e1159f3bfaf079 https://github.com/teiid/teiid/commit/14d866d1c3ee1e3d573e714ee3e1159f3bf... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2018-12-18 (Tue, 18 Dec 2018) Changed paths: M client/src/main/java/org/teiid/jdbc/XAConnectionImpl.java M client/src/test/java/org/teiid/jdbc/TestXAConnection.java M engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestTransactions.java Log Message: ----------- TEIID-5578 addressing issues with xa import # Conflicts: # engine/src/main/java/org/teiid/dqp/internal/process/TransactionServerImpl.java **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.