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

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 721c4e1a5ce5382bc8ba3da3001ed820dba8c5ce
      https://github.com/teiid/teiid/commit/721c4e1a5ce5382bc8ba3da3001ed820dba8c5ce
  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


  Commit: c196ff28eb4a02ac38650d0fa1b1fbabc6403dcc
      https://github.com/teiid/teiid/commit/c196ff28eb4a02ac38650d0fa1b1fbabc6403dcc
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M connectors/infinispan/connector-infinispan-hotrod/src/main/java/org/teiid/resource/adapter/infinispan/hotrod/InfinispanManagedConnectionFactory.java
    M connectors/infinispan/connector-infinispan-hotrod/src/main/resources/org/teiid/resource/adapter/infinispan/hotrod/i18n.properties
    M connectors/infinispan/feature-pack-infinispan/src/main/resources/modules/system/layers/dv/org/jboss/teiid/resource-adapter/infinispan/hotrod/main/META-INF/ra.xml

  Log Message:
  -----------
  Merge branch 'master' of github.com:teiid/teiid


Compare: https://github.com/teiid/teiid/compare/056f8a684509...c196ff28eb4a