Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 725c036ffe3449ede714cad9e82632ee9b2a6e57 https://github.com/teiid/teiid/commit/725c036ffe3449ede714cad9e82632ee9b2... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-09-09 (Tue, 09 Sep 2014) Changed paths: M engine/src/main/java/org/teiid/query/function/FunctionLibrary.java M engine/src/test/java/org/teiid/query/function/TestFunctionTree.java Log Message: ----------- TEIID-3111 making function resolving more consistent Commit: 3ebe848d430ca2f5310b15eb869a9f0e3a4579e8 https://github.com/teiid/teiid/commit/3ebe848d430ca2f5310b15eb869a9f0e3a4... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-09-09 (Tue, 09 Sep 2014) Changed paths: M runtime/src/main/java/org/teiid/runtime/AbstractVDBDeployer.java M runtime/src/main/resources/org/teiid/runtime/i18n.properties Log Message: ----------- TEIID-3097 broadening the check to include internal model names as well Conflicts: runtime/src/main/resources/org/teiid/runtime/i18n.properties Compare: https://github.com/teiid/teiid/compare/20b8d40366d4...3ebe848d430c