Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: f7b5fc54b259ba70a1119bd5424e5c511b7f8cbf https://github.com/teiid/teiid/commit/f7b5fc54b259ba70a1119bd5424e5c511b7... Author: Tom Arnold <tom9729(a)gmail.com&gt; Date: 2015-05-28 (Thu, 28 May 2015) Changed paths: M api/src/main/java/org/teiid/translator/SourceSystemFunctions.java M engine/src/main/java/org/teiid/query/QueryPlugin.java M engine/src/main/java/org/teiid/query/function/FunctionMethods.java M engine/src/main/java/org/teiid/query/util/CommandContext.java M engine/src/main/resources/org/teiid/query/i18n.properties M engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java M engine/src/test/java/org/teiid/query/processor/TestGeometry.java M engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java M engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected Log Message: ----------- TEIID-3491 Added REGEXP_REPLACE. Commit: 116b2df46cf1b2cb5e53b6968aed5434c687a416 https://github.com/teiid/teiid/commit/116b2df46cf1b2cb5e53b6968aed5434c68... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2015-05-29 (Fri, 29 May 2015) Changed paths: M api/src/main/java/org/teiid/translator/SourceSystemFunctions.java M engine/src/main/java/org/teiid/query/QueryPlugin.java M engine/src/main/java/org/teiid/query/function/FunctionMethods.java M engine/src/main/java/org/teiid/query/util/CommandContext.java M engine/src/main/resources/org/teiid/query/i18n.properties M engine/src/test/java/org/teiid/query/function/TestFunctionMethods.java M engine/src/test/java/org/teiid/query/processor/TestGeometry.java M engine/src/test/java/org/teiid/query/processor/eval/TestExpressionEvaluator.java M engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected Log Message: ----------- Merge branch 'TEIID-3491' of https://github.com/Tom9729/teiid Conflicts: engine/src/main/resources/org/teiid/query/i18n.properties test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected Compare: https://github.com/teiid/teiid/compare/aaa1da12fd79...116b2df46cf1