Branch: refs/heads/62-8.7.x Home: https://github.com/teiid/teiid Commit: cd81cabfe36a03955bfbb255689ca51d9d4e3f0c https://github.com/teiid/teiid/commit/cd81cabfe36a03955bfbb255689ca51d9d4... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-07-01 (Wed, 01 Jul 2015) Changed paths: M odata/src/main/java/org/teiid/odata/LocalClient.java M odata/src/main/java/org/teiid/odata/ODataPlugin.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 Log Message: ----------- TEIID-3553 adding exceptions on ambiguity Conflicts: odata/src/test/java/org/teiid/odata/TestODataIntegration.java olingo/pom.xml