[teiid-commits] [teiid/teiid] 2eaa9a: Merge branch 'master' into kylin.dev.1

[shawkins]

  Branch: refs/heads/master
  Home:   https://github.com/teiid/teiid
  Commit: 2eaa9abab2997264cf0e0bfcb54715aca48793fa
      https://github.com/teiid/teiid/commit/2eaa9abab2997264cf0e0bfcb54715aca48793fa
  Author: kylinsoong <kylinsoong.1214 at gmail.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java
    M engine/src/test/java/org/teiid/query/optimizer/TestJoinOptimization.java

  Log Message:
  -----------
  Merge branch 'master' into kylin.dev.1


  Commit: 9df434920c5138e225cd22b543e781f83abaa8ac
      https://github.com/teiid/teiid/commit/9df434920c5138e225cd22b543e781f83abaa8ac
  Author: kylinsoong <kylinsoong.1214 at gmail.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/metadata/TestMetadataValidator.java

  Log Message:
  -----------
  TEIID-3999: add validation for load scripts


  Commit: bbc5a46a2814e99b48f997c311e74400e59ec480
      https://github.com/teiid/teiid/commit/bbc5a46a2814e99b48f997c311e74400e59ec480
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/metadata/TestMetadataValidator.java

  Log Message:
  -----------
  Merge branch 'kylin.dev.1' of https://github.com/kylinsoong/teiid


  Commit: fef40cd360cb8a0dcf0331d9504ab2be3c7a25d4
      https://github.com/teiid/teiid/commit/fef40cd360cb8a0dcf0331d9504ab2be3c7a25d4
  Author: shawkins <shawkins at redhat.com>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java

  Log Message:
  -----------
  TEIID-3999 minor refinements


Compare: https://github.com/teiid/teiid/compare/9528f1a6e6c8...fef40cd360cb