[teiid-commits] [teiid/teiid] f40ac2: TEIID-3910 restricting the string conversion logic

[shawkins]

  Branch: refs/heads/8.12.x
  Home:   https://github.com/teiid/teiid
  Commit: f40ac291c0a7e36bfc733783f417494161b0580f
      https://github.com/teiid/teiid/commit/f40ac291c0a7e36bfc733783f417494161b0580f
  Author: shawkins <shawkins at redhat.com>
  Date:   2016-01-18 (Mon, 18 Jan 2016)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
    M olingo/src/main/java/org/teiid/olingo/ODataTypeManager.java
    M olingo/src/main/resources/org/teiid/olingo/i18n.properties
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-3910 restricting the string conversion logic
Conflicts:
	olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
	olingo/src/main/resources/org/teiid/olingo/i18n.properties
	olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java