Branch: refs/heads/9.3.x Home: https://github.com/teiid/teiid Commit: 78ee6e1cf6e6683ce889c5d27f2fb2aba6026502 https://github.com/teiid/teiid/commit/78ee6e1cf6e6683ce889c5d27f2fb2aba60... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2018-02-03 (Sat, 03 Feb 2018) Changed paths: M api/src/main/java/org/teiid/metadata/FunctionMethod.java M api/src/main/java/org/teiid/metadata/FunctionParameter.java M api/src/main/java/org/teiid/metadata/ProcedureParameter.java M metadata/src/main/java/org/teiid/metadata/index/IndexMetadataRepository.java M metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected Log Message: ----------- TEIID-5250 fixing duplicate uid issue with index metadata functions # Conflicts: # test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected # Conflicts: # test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected