Branch: refs/heads/62-8.7.x Home: https://github.com/teiid/teiid Commit: 92d069e4944ff9dba30772fc7d781ffe3c504594 https://github.com/teiid/teiid/commit/92d069e4944ff9dba30772fc7d781ffe3c5... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2015-06-18 (Thu, 18 Jun 2015) Changed paths: M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataEntitySchemaBuilder.java M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataMetadataProcessor.java M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataTypeManager.java M odata/src/main/java/org/teiid/odata/LocalClient.java M pom.xml Log Message: ----------- TEIID-3538: Key properties are correctly categorized as non-nulls, List is converted to Collection Conflicts: olingo/src/main/java/org/teiid/olingo/service/OData4EntitySchemaBuilder.java olingo/src/test/resources/loopy-edmx-metadata.xml pom.xml Commit: 4138107b04580e7adfa717945b1d0d5600288f1d https://github.com/teiid/teiid/commit/4138107b04580e7adfa717945b1d0d56002... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2015-06-18 (Thu, 18 Jun 2015) Changed paths: M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataEntitySchemaBuilder.java M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataMetadataProcessor.java M connectors/translator-odata/src/main/java/org/teiid/translator/odata/ODataTypeManager.java M odata/src/main/java/org/teiid/odata/LocalClient.java M pom.xml Log Message: ----------- Merge pull request #478 from rareddy/62-8.7.x TEIID-3538: Key properties are correctly categorized as non-nulls, Li… Compare: https://github.com/teiid/teiid/compare/d6787ee69604...4138107b0458