[teiid-commits] [teiid/teiid] 90f4f5: TEIID-4283 making sure that loads don't conflict

Branch: refs/heads/9.0.x Home: https://github.com/teiid/teiid Commit: 90f4f5058203a9386b5704a3ee5b32be2cfa44ca https://github.com/teiid/teiid/commit/90f4f5058203a9386b5704a3ee5b32be2cf... 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