Branch: refs/heads/8.7.x
Home:
https://github.com/teiid/teiid
Commit: f31e342ee4e5f7a4b88465767ba1e3b9375dd0cd
https://github.com/teiid/teiid/commit/f31e342ee4e5f7a4b88465767ba1e3b9375...
Author: shawkins <shawkins(a)redhat.com>
Date: 2015-05-19 (Tue, 19 May 2015)
Changed paths:
M api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
M api/src/main/java/org/teiid/translator/ExecutionFactory.java
M build/kits/jboss-as7/docs/teiid/teiid-releasenotes.html
M
connectors/translator-accumulo/src/main/java/org/teiid/translator/accumulo/AccumuloExecutionFactory.java
M
connectors/translator-simpledb/src/main/java/org/teiid/translator/simpledb/SimpleDBExecutionFactory.java
M
connectors/translator-solr/src/main/java/org/teiid/translator/solr/SolrExecutionFactory.java
M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
M engine/src/main/java/org/teiid/query/processor/CollectionTupleSource.java
M engine/src/main/java/org/teiid/query/processor/relational/ProjectIntoNode.java
M engine/src/main/java/org/teiid/query/tempdata/TempTable.java
M engine/src/test/java/org/teiid/dqp/internal/datamgr/FakeConnector.java
M engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java
M engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java
M engine/src/test/java/org/teiid/query/processor/relational/TestProjectIntoNode.java
Log Message:
-----------
TEIID-3437: Inconsistencies with row count handling
Conflicts:
api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java