Branch: refs/heads/62-8.7.x Home: https://github.com/teiid/teiid Commit: b46ed63a8768856efde52f972432403c8d8880e4 https://github.com/teiid/teiid/commit/b46ed63a8768856efde52f972432403c8d8... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2015-07-15 (Wed, 15 Jul 2015) Changed paths: M odata/src/main/java/org/teiid/odata/LocalClient.java Log Message: ----------- TEIID-3569: providing a way to set JDBC connection properties through servlet init properties; thus if passthough needs to be false, it can be set as init property, if not available this will default to true as before Conflicts: odata/src/main/java/org/teiid/odata/LocalClient.java olingo/src/main/java/org/teiid/olingo/service/LocalClient.java Commit: 0c635fc8f5d9d5a091687fca77746b3d8a28e9bb https://github.com/teiid/teiid/commit/0c635fc8f5d9d5a091687fca77746b3d8a2... Author: Ramesh Reddy <rareddy(a)jboss.org&gt; Date: 2015-07-15 (Wed, 15 Jul 2015) Changed paths: M odata/src/main/java/org/teiid/odata/LocalClient.java Log Message: ----------- Merge pull request #493 from rareddy/TEIID-3569 TEIID-3569: providing a way to set JDBC connection properties through… Compare: https://github.com/teiid/teiid/compare/553ea9b75c4a...0c635fc8f5d9