Branch: refs/heads/11.1.x Home: https://github.com/teiid/teiid Commit: 540622d3594eef485512658c17c4489a77422769 https://github.com/teiid/teiid/commit/540622d3594eef485512658c17c4489a774... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2018-11-19 (Mon, 19 Nov 2018) Changed paths: M olingo/src/main/java/org/teiid/olingo/service/ODataSchemaBuilder.java M olingo/src/main/java/org/teiid/olingo/service/TeiidEdmProvider.java M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java Log Message: ----------- TEIID-5544 fixing the term for teiid annotations # Conflicts: # olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java # Conflicts: # olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.