[teiid-commits] [teiid/teiid] 9ebe69: TEIID-2781 refining composite key updates
Branch: refs/heads/8.4.x
Home: https://github.com/teiid/teiid
Commit: 9ebe6909339985c29892aa0cc50f1537d19f7a56
https://github.com/teiid/teiid/commit/9ebe6909339985c29892aa0cc50f1537d19...
Author: shawkins <shawkins(a)redhat.com>
Date: 2014-01-06 (Mon, 06 Jan 2014)
Changed paths:
M odata/pom.xml
M odata/src/main/java/org/teiid/odata/ODataPlugin.java
M odata/src/main/java/org/teiid/odata/ODataSQLBuilder.java
M odata/src/main/java/org/teiid/odata/TeiidProducer.java
M odata/src/main/resources/org/teiid/odata/i18n.properties
M odata/src/test/java/org/teiid/odata/TestODataIntegration.java
A runtime/src/test/java/org/teiid/runtime/HardCodedExecutionFactory.java
M test-integration/common/pom.xml
R test-integration/common/src/test/java/org/teiid/jdbc/HardCodedExecutionFactory.java
M test-integration/common/src/test/java/org/teiid/jdbc/TestRowBasedSecurity.java
M test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java
M
test-integration/common/src/test/java/org/teiid/transport/TestJDBCSocketTransport.java
M
test-integration/perf/src/test/java/org/teiid/query/eval/TestJDBCSocketPerformance.java
M
test-integration/perf/src/test/java/org/teiid/query/eval/TestMaterializationPerformance.java
M test-integration/perf/src/test/java/org/teiid/query/eval/TestSystemPerformance.java
Log Message:
-----------
TEIID-2781 refining composite key updates
Conflicts:
odata/src/main/java/org/teiid/odata/ODataPlugin.java
odata/src/main/resources/org/teiid/odata/i18n.properties
odata/src/test/java/org/teiid/odata/TestODataIntegration.java
test-integration/common/src/test/java/org/teiid/systemmodel/TestAsynch.java