Branch: refs/heads/8.13.x Home: https://github.com/teiid/teiid Commit: 69817c221a4faad803ba765154f65cad89a4caf0 https://github.com/teiid/teiid/commit/69817c221a4faad803ba765154f65cad89a... Author: Juraj Duráni <jdurani(a)redhat.com&gt; Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java Log Message: ----------- TEIID-4007 - fixed extraction of name of the model if context root is changed Commit: 973e7834c4fe6e6b81223969d8210ac30c597a6e https://github.com/teiid/teiid/commit/973e7834c4fe6e6b81223969d8210ac30c5... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2016-03-01 (Tue, 01 Mar 2016) Changed paths: M olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java Log Message: ----------- TEIID-4007 refining the filter logic further Conflicts: olingo/src/main/java/org/teiid/olingo/web/ODataFilter.java Compare: https://github.com/teiid/teiid/compare/a9eb2f808539...973e7834c4fe