Branch: refs/heads/teiid-8.x-upgrade Home: https://github.com/Teiid-Designer/teiid-designer Commit: b3fd849e798b03c3ca8ba4dc2e8c0c1e4a2308ed https://github.com/Teiid-Designer/teiid-designer/commit/b3fd849e798b03c3c... Author: Ted Jones <tejones(a)redhat.com&gt; Date: 2012-09-27 (Thu, 27 Sep 2012) Changed paths: M plugins/org.teiid.designer.dqp/META-INF/MANIFEST.MF M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionAdmin.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/PreviewManager.java R plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/jobs/MergePreviewVdbJob.java Log Message: ----------- TEIIDDES-1209: Updated merge method to import VDBs. Also, made other changes to get preview working like adding a dummy model to the project PVDB in order to deploy to Teiid. See TEIID-2230. Commit: e502e505fe622adb26943af42f0de4556c8a0f70 https://github.com/Teiid-Designer/teiid-designer/commit/e502e505fe622adb2... Author: Barry LaFond <blafond(a)redhat.com&gt; Date: 2012-09-27 (Thu, 27 Sep 2012) Changed paths: M plugins/org.teiid.designer.dqp/META-INF/MANIFEST.MF M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/ExecutionAdmin.java M plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/PreviewManager.java R plugins/org.teiid.designer.dqp/src/org/teiid/designer/runtime/preview/jobs/MergePreviewVdbJob.java Log Message: ----------- Merge pull request #34 from tejones/teiiddes-1209xx TEIIDDES-1209: Updated merge method to import VDBs. Also, made other cha... Compare: https://github.com/Teiid-Designer/teiid-designer/compare/1f0e303d81bb...e...