Branch: refs/heads/master Home: https://github.com/Teiid-Designer/teiid-designer Commit: 33aa0e641679bff163ffac8047f66a75d11c41a0 https://github.com/Teiid-Designer/teiid-designer/commit/33aa0e641679bff16... Author: Paul Richardson <p.g.richardson(a)redhat.com&gt; Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServer.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/runtime/spi/IExecutionAdmin.java M plugins/teiid/org.teiid.7.7.x M plugins/teiid/org.teiid.8.2.x Log Message: ----------- Restrict the preview import vdb functionality to teiid 8+ servers * Restores the merge method to Teiid 7 ExecutionAdmin, only allowing the import vdb functionality to 8+ servers. * Merge should remain deprecated since it is only for backward compatibility Commit: ad3b5d206f2dc1741484011344178cae694f5e8b https://github.com/Teiid-Designer/teiid-designer/commit/ad3b5d206f2dc1741... Author: Barry LaFond <blafond(a)redhat.com&gt; Date: 2013-02-14 (Thu, 14 Feb 2013) Changed paths: M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/TeiidServer.java M plugins/org.teiid.designer.spi/src/org/teiid/designer/runtime/spi/IExecutionAdmin.java M plugins/teiid/org.teiid.7.7.x M plugins/teiid/org.teiid.8.2.x Log Message: ----------- Merge pull request #105 from phantomjinx/master Adds API for mergeVdbs in IExecutionAdmin Compare: https://github.com/Teiid-Designer/teiid-designer/compare/7be2d4839e70...a...