[teiid-commits] [teiid/teiid] 2f6a62: TEIID-4641:Updating the materilization management ...

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 2f6a625690b82dbc28ef62033c25fcc122b727eb
      https://github.com/teiid/teiid/commit/2f6a625690b82dbc28ef62033c25fcc122b727eb
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2016-12-19 (Mon, 19 Dec 2016)

  Changed paths:
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/metadata/MaterializationMetadataRepository.java
    M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
    M engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
    M engine/src/main/resources/org/teiid/query/i18n.properties
    A test-integration/common/src/test/java/org/teiid/systemmodel/TestExternalMatViews.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected

  Log Message:
  -----------
  TEIID-4641:Updating the materilization management scripts to use merge/delete schema with help of new load number column on view


  Commit: d840c368c5a4206ccd7a58091a64aac6722a471f
      https://github.com/teiid/teiid/commit/d840c368c5a4206ccd7a58091a64aac6722a471f
  Author: shawkins <shawkins at redhat.com>
  Date:   2016-12-20 (Tue, 20 Dec 2016)

  Changed paths:
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/metadata/MaterializationMetadataRepository.java
    M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
    M engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
    M engine/src/main/resources/org/teiid/query/i18n.properties
    A test-integration/common/src/test/java/org/teiid/systemmodel/TestExternalMatViews.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViews.java
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testProcedureColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected

  Log Message:
  -----------
  Merge branch 'TEIID-4641' of https://github.com/rareddy/teiid

# Conflicts:
#	engine/src/main/java/org/teiid/query/QueryPlugin.java
#	engine/src/main/resources/org/teiid/query/i18n.properties


Compare: https://github.com/teiid/teiid/compare/4318c58f331f...d840c368c5a4