Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 3508e152c240478fcad948bbb8cafeb2259f92ee https://github.com/teiid/teiid/commit/3508e152c240478fcad948bbb8cafeb2259... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M engine/src/main/java/org/teiid/query/function/FunctionLibrary.java M engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java M engine/src/test/java/org/teiid/query/unittest/RealMetadataFactory.java Log Message: ----------- TEIID-3160 ensuring that function resolving won't narrow inappropriately Conflicts: engine/src/test/java/org/teiid/query/resolver/TestFunctionResolving.java