[teiid-commits] [teiid/teiid] 567559: TEIID-4309 determining the cardinality after the a...

[Steven Hawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 567559583fd0d7b3dc3f956c2700882cba851c8a
      https://github.com/teiid/teiid/commit/567559583fd0d7b3dc3f956c2700882cba851c8a
  Author: shawkins <shawkins at redhat.com>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M engine/src/main/resources/org/teiid/metadata/SYSADMIN.sql
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testStoredProcedures.expected

  Log Message:
  -----------
  TEIID-4309 determining the cardinality after the after script


  Commit: bb0ceb40aefe9d8cbb8ce1ee215b8fe350de45b3
      https://github.com/teiid/teiid/commit/bb0ceb40aefe9d8cbb8ce1ee215b8fe350de45b3
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2016-07-18 (Mon, 18 Jul 2016)

  Changed paths:
    M build/assembly/wildfly-dist.xml
    M build/pom.xml
    M engine/pom.xml
    A engine/src/main/java/org/teiid/query/function/Maskutil.java
    A engine/src/main/java/org/teiid/query/function/MaskutilFunction.java
    M engine/src/main/java/org/teiid/query/function/SystemFunctionManager.java
    M jboss-integration/kits/wildfly-dist.xml
    A jboss-integration/kits/wildfly/modules/org/arrahtec/main/module.xml
    M jboss-integration/kits/wildfly/modules/org/jboss/teiid/main/module.xml
    M pom.xml
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected

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


Compare: https://github.com/teiid/teiid/compare/c23f13c6bdb9...bb0ceb40aefe