Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: f61d9ca7a86658626deec6458450ffaa675e13c4 https://github.com/teiid/teiid/commit/f61d9ca7a86658626deec6458450ffaa675... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-01-26 (Thu, 26 Jan 2017) Changed paths: M connectors/infinispan/translator-infinispan-hotrod/src/test/java/org/teiid/translator/infinispan/hotrod/TestInfinispanUpdateExecution.java M connectors/infinispan/translator-object/src/main/java/org/teiid/translator/object/ObjectExecutionFactory.java M connectors/infinispan/translator-object/src/main/java/org/teiid/translator/object/ObjectUpdateExecution.java Log Message: ----------- TEIID-4497 adding upsert support Commit: 1ec8db11c660a566b8e5f5b54df14efa940e9bd5 https://github.com/teiid/teiid/commit/1ec8db11c660a566b8e5f5b54df14efa940... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2017-01-26 (Thu, 26 Jan 2017) Changed paths: M api/src/main/java/org/teiid/language/SQLConstants.java M api/src/main/java/org/teiid/metadata/MetadataFactory.java M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj M engine/src/main/resources/org/teiid/query/i18n.properties M engine/src/test/java/org/teiid/query/parser/TestDDLParser.java Log Message: ----------- Merge branch 'master' of github.com:teiid/teiid Compare: https://github.com/teiid/teiid/compare/587b178cb599...1ec8db11c660