Branch: refs/heads/62-8.7.x Home: https://github.com/teiid/teiid Commit: 632678847aa242f288b853bcb4bd8d196976f304 https://github.com/teiid/teiid/commit/632678847aa242f288b853bcb4bd8d19697... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-04-27 (Mon, 27 Apr 2015) Changed paths: M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/DSLSearch.java M connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/InfinispanExecutionFactory.java M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectExecution.java M connectors/translator-object/src/main/java/org/teiid/translator/object/infinispan/DSLSearch.java M connectors/translator-object/src/test/java/org/teiid/translator/object/infinispan/TestInfinispanJndiDSLSearch.java Log Message: ----------- TEIID-3453 and TEIID-3424 to fix infinispan searching Conflicts: connectors/translator-infinispan-dsl/src/main/java/org/teiid/translator/infinispan/dsl/DSLSearch.java connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectExecution.java Commit: 137d89bf161895f4f6b835c7f071888f59d00fb7 https://github.com/teiid/teiid/commit/137d89bf161895f4f6b835c7f071888f59d... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2015-04-27 (Mon, 27 Apr 2015) Changed paths: M build/kits/jboss-as7/bin/scripts/teiid-domain-mode-install.cli M build/kits/jboss-as7/bin/scripts/teiid-standalone-mode-install.cli Log Message: ----------- Merge branch '62-8.7.x' of https://github.com/teiid/teiid into 62-8.7.x Compare: https://github.com/teiid/teiid/compare/09853170554f...137d89bf1618