Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: f8e53fc3c0f69ac702947185caabee4b01b40b82 https://github.com/teiid/teiid/commit/f8e53fc3c0f69ac702947185caabee4b01b... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-10-09 (Thu, 09 Oct 2014) Changed paths: M client/src/main/java/org/teiid/jdbc/TeiidDataSource.java M client/src/test/java/org/teiid/jdbc/TestTeiidDataSource.java Log Message: ----------- TEIID-3165 updating property handling Conflicts: client/src/main/java/org/teiid/jdbc/TeiidDataSource.java Commit: 4a7c561f6ec81522b1e806a9115f2c8380848ad6 https://github.com/teiid/teiid/commit/4a7c561f6ec81522b1e806a9115f2c83808... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2014-10-09 (Thu, 09 Oct 2014) Changed paths: A build/kits/jboss-as7/docs/teiid/datasources/infinispan/add-infinispan-cache-dsl-translator.cli A build/kits/jboss-as7/docs/teiid/datasources/infinispan/add-infinispan-cache-translator.cli M build/kits/jboss-as7/docs/teiid/datasources/infinispan/infinispan-remote-query-dsl-ds.xml M build/kits/jboss-as7/docs/teiid/datasources/infinispan/readme.txt M connectors/connector-infinispan-dsl/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/infinispan/dsl/main/module.xml M connectors/translator-infinispan-dsl/kits/jboss-as7/modules/org/jboss/teiid/translator/infinispan/dsl/main/module.xml M connectors/translator-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/base/AbstractInfinispanManagedConnectionFactory.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/InfinispanExecution.java Log Message: ----------- Merge branch '8.7.x' of https://github.com/teiid/teiid into 8.7.x Compare: https://github.com/teiid/teiid/compare/50e266d58f89...4a7c561f6ec8