Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: f0612ee01ef9b07da4f8431ffc14569d5852e142 https://github.com/teiid/teiid/commit/f0612ee01ef9b07da4f8431ffc14569d585... Author: Ted Jones <tejones(a)redhat.com&gt; Date: 2015-05-29 (Fri, 29 May 2015) Changed paths: R connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/ConcatFunctionModifier.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/HanaExecutionFactory.java R connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaConvertModifier.java A connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaTranslator.java Log Message: ----------- teiid-3151: Removed Concat modifier and changed convert modifier test to translator test. Commit: 64457b770977ebd3b51349f6773b396fee1cc5a1 https://github.com/teiid/teiid/commit/64457b770977ebd3b51349f6773b396fee1... Author: Steven Hawkins <shawkins(a)redhat.com&gt; Date: 2015-05-29 (Fri, 29 May 2015) Changed paths: R connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/ConcatFunctionModifier.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/hana/HanaExecutionFactory.java R connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaConvertModifier.java Log Message: ----------- Merge branch 'teiid-3151' of https://github.com/tejones/teiid Conflicts: connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/hana/TestHanaConvertModifier.java Compare: https://github.com/teiid/teiid/compare/2702227806df...64457b770977