Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: dbb966efa1dd2818f873d2b6f42c4f54ace3ecd3 https://github.com/teiid/teiid/commit/dbb966efa1dd2818f873d2b6f42c4f54ace... Author: Van Halbert <vhalbert(a)redhat.com&gt; Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M common-core/src/main/java/org/teiid/core/util/ObjectConverterUtil.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/DSLSearch.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/InfinispanExecutionFactory.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/InfinispanPlugin.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/InfinispanUpdateExecution.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/metadata/ProtobufMetadataProcessor.java M connectors/translator-infinispan-dsl/src/main/resources/org/teiid/translator/infinispan/dsl/i18n.properties M connectors/translator-infinispan-dsl/src/test/java/org/jboss/teiid/jdg_remote/pojo/AllTypes.java M connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/TestInfinispanUpdateUsingAllTypes.java M connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestProtobufMetadataProcessor.java M connectors/translator-infinispan-dsl/src/test/resources/allTypes.proto Log Message: ----------- TEIID-3573 and TEIID-3539 disabled supportNot and supportNull. And as part of testing, further adjustment was needed to converting the data to the correct type for performing searches. Which started with the changes related to TEIID-3533 and transforming to the appropriate data type. Conflicts: connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/DSLSearch.java connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestProtobufMetadataProcessor.java Commit: 9c50332d0fab8293b3a585c65e61aa3f1fc9b3dd https://github.com/teiid/teiid/commit/9c50332d0fab8293b3a585c65e61aa3f1fc... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2015-07-29 (Wed, 29 Jul 2015) Changed paths: M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataEntitySchemaBuilder.java M connectors/translator-odata/src/test/java/org/teiid/translator/odata/TestDataEntitySchemaBuilder.java Log Message: ----------- Merge branch 'master' of https://github.com/teiid/teiid Compare: https://github.com/teiid/teiid/compare/1b02dd35629f...9c50332d0fab