[teiid-commits] [teiid/teiid] f9cab7: TEIID-3553: adding exceptions on ambiguity, changi...

[shawkins]

  Branch: refs/heads/8.7.x
  Home:   https://github.com/teiid/teiid
  Commit: f9cab7c68c8dadd0d93d8858920b57ebdf627ea4
      https://github.com/teiid/teiid/commit/f9cab7c68c8dadd0d93d8858920b57ebdf627ea4
  Author: shawkins <shawkins at redhat.com>
  Date:   2015-09-17 (Thu, 17 Sep 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, changing from odata 0.8.0 to oreva 0.8.7
Conflicts:
	odata/src/test/java/org/teiid/odata/TestODataIntegration.java
	olingo/pom.xml

Conflicts:
	odata/src/main/java/org/teiid/odata/LocalClient.java