Branch: refs/heads/63-8.12.x Home: https://github.com/teiid/teiid Commit: 8c83f74767c017b2eeabca267687e0d9e05312f9 https://github.com/teiid/teiid/commit/8c83f74767c017b2eeabca267687e0d9e05... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M engine/src/main/java/org/teiid/query/sql/symbol/Array.java M engine/src/main/java/org/teiid/query/sql/symbol/ScalarSubquery.java M engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java Log Message: ----------- TEIID-4023 fixing hashcode Conflicts: engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java Commit: dba34ae6c356cd3d918a960d38b88bc7c98ca511 https://github.com/teiid/teiid/commit/dba34ae6c356cd3d918a960d38b88bc7c98... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-03-04 (Fri, 04 Mar 2016) Changed paths: M engine/src/main/java/org/teiid/query/processor/proc/ExecDynamicSqlInstruction.java M engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java M test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected M test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected Log Message: ----------- TEIID-4022 correcting ambiguity and logging Conflicts: engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected Compare: https://github.com/teiid/teiid/compare/97f510964a25...dba34ae6c356