Branch: refs/heads/9.0.x Home: https://github.com/teiid/teiid Commit: 3c2360aff72f2b23d2eb5612ddb0040f35549f17 https://github.com/teiid/teiid/commit/3c2360aff72f2b23d2eb5612ddb0040f355... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-09-12 (Mon, 12 Sep 2016) Changed paths: M connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/SalesforceConnectionImpl.java M connectors/translator-salesforce-34/src/main/java/org/teiid/translator/salesforce34/SalesForce34ExecutionFactory.java A connectors/translator-salesforce-34/src/test/java/org/teiid/translator/salesforce/TestSalesForce34ExecutionFactory.java M connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesForceExecutionFactory.java M connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/SalesforceConnection.java M connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java M connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java M connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java Log Message: ----------- TEIID-4439 fixing version difference # Conflicts: # connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/QueryExecutionImpl.java # connectors/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/TestQueryExecutionImpl.java