Branch: refs/heads/master
Home:
https://github.com/teiid/teiid
Commit: 269d80c20a43a42e1d9591b56644842dcae6e040
https://github.com/teiid/teiid/commit/269d80c20a43a42e1d9591b56644842dcae...
Author: kylinsoong <kylinsoong.1214(a)gmail.com>
Date: 2016-04-15 (Fri, 15 Apr 2016)
Changed paths:
M engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
M test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java
M
test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected
Log Message:
-----------
update loadmatview as a universal procedure to update both Internal and External Mat
View
Commit: 3fff51b2bb11c0e86bb78947be5bda9097ab6a84
https://github.com/teiid/teiid/commit/3fff51b2bb11c0e86bb78947be5bda9097a...
Author: shawkins <shawkins(a)redhat.com>
Date: 2016-04-19 (Tue, 19 Apr 2016)
Changed paths:
M engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
M test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java
M
test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected
Log Message:
-----------
Merge branch 'kylin.dev.1' of
https://github.com/kylinsoong/teiid
Conflicts:
test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected
Compare:
https://github.com/teiid/teiid/compare/0264c26f2010...3fff51b2bb11