Branch: refs/heads/63-8.12.x Home: https://github.com/teiid/teiid Commit: 4f995b65369bdb709532690d86ae61ff9d8425ad https://github.com/teiid/teiid/commit/4f995b65369bdb709532690d86ae61ff9d8... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-03-16 (Wed, 16 Mar 2016) Changed paths: M build/kits/jboss-as7/modules/org/jboss/teiid/olingo/main/module.xml M olingo/pom.xml M olingo/src/main/java/org/teiid/olingo/ODataPlugin.java M olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java M olingo/src/main/java/org/teiid/olingo/web/ODataServlet.java M olingo/src/main/resources/org/teiid/olingo/i18n.properties M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java Log Message: ----------- TEIID-3914 TEIID-3911 updating test and refining error handling Conflicts: olingo/src/main/java/org/teiid/olingo/ODataPlugin.java olingo/src/main/resources/org/teiid/olingo/i18n.properties Commit: 0177850dfe3350b8f38fdce47ead697d5291ab68 https://github.com/teiid/teiid/commit/0177850dfe3350b8f38fdce47ead697d529... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-03-16 (Wed, 16 Mar 2016) Changed paths: M olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java Log Message: ----------- TEIID-3911 improving error handling in the odata filter with a json reponse and error codes Conflicts: olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java Compare: https://github.com/teiid/teiid/compare/66d62f1a11c2...0177850dfe33