Branch: refs/heads/64-8.12.x Home: https://github.com/teiid/teiid Commit: ab1bb242c54e713538e134406ee6191677496152 https://github.com/teiid/teiid/commit/ab1bb242c54e713538e134406ee61916774... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M olingo/src/main/java/org/teiid/odata/api/Client.java M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java Log Message: ----------- TEIID-4231 better handling for a non-active vdb # Conflicts: # test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java Commit: 64aa1ac125bf8c5f7c5520cbd185c293a51ce911 https://github.com/teiid/teiid/commit/64aa1ac125bf8c5f7c5520cbd185c293a51... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-03-31 (Fri, 31 Mar 2017) Changed paths: M odata/src/main/java/org/teiid/odata/LocalClient.java M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java Log Message: ----------- TEIID-4231 adding a check for active Compare: https://github.com/teiid/teiid/compare/3e768534c77c...64aa1ac125bf