Branch: refs/heads/master Home: https://github.com/teiid/teiid Commit: 6687f8067a8a9494f3c61b745ee1148416278d91 https://github.com/teiid/teiid/commit/6687f8067a8a9494f3c61b745ee11484162... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-06-21 (Tue, 21 Jun 2016) Changed paths: M engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql M test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected Log Message: ----------- TEIID-4283 making sure that loads don't conflict Conflicts: test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected