[teiid-commits] [teiid/teiid] be0392: TEIID-4968 fixing the duplicate type

[shawkins]

  Branch: refs/heads/9.2.x
  Home:   https://github.com/teiid/teiid
  Commit: be03928590f9e0f07a8c9e9d6e55e8b4e563ea81
      https://github.com/teiid/teiid/commit/be03928590f9e0f07a8c9e9d6e55e8b4e563ea81
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java
    M test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected

  Log Message:
  -----------
  TEIID-4968 fixing the duplicate type
# Conflicts:
#	test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected