Branch: refs/heads/8.7.x Home: https://github.com/teiid/teiid Commit: 317aea4beb8edf3cb539fa70b65e6e1c2fe8d885 https://github.com/teiid/teiid/commit/317aea4beb8edf3cb539fa70b65e6e1c2fe... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2014-09-02 (Tue, 02 Sep 2014) Changed paths: M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java M test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java Log Message: ----------- TEIID-3109 preventing duplicate exceptions Conflicts: test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected