[teiid-commits] [teiid/teiid] 45fc22: changed version to 8.12.1.6_4

shawkins shawkins at redhat.com
Tue Feb 20 11:17:08 EST 2018


  Branch: refs/heads/64-8.12.x
  Home:   https://github.com/teiid/teiid
  Commit: 45fc22149774f5fc941d56c0eafa69abde91353c
      https://github.com/teiid/teiid/commit/45fc22149774f5fc941d56c0eafa69abde91353c
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-03-13 (Mon, 13 Mar 2017)

  Changed paths:
    M admin/pom.xml
    M adminshell/pom.xml
    M api/pom.xml
    M build/pom.xml
    M client-jdk15/pom.xml
    M client/pom.xml
    M common-core/pom.xml
    M connectors/connector-accumulo/pom.xml
    M connectors/connector-cassandra/pom.xml
    M connectors/connector-file/pom.xml
    M connectors/connector-google/pom.xml
    M connectors/connector-infinispan-dsl/pom.xml
    M connectors/connector-infinispan.6/pom.xml
    M connectors/connector-ldap/pom.xml
    M connectors/connector-mongodb/pom.xml
    M connectors/connector-salesforce-34/pom.xml
    M connectors/connector-salesforce/pom.xml
    M connectors/connector-simpledb/pom.xml
    M connectors/connector-solr/pom.xml
    M connectors/connector-ws/pom.xml
    M connectors/google-api/pom.xml
    M connectors/mongodb-api/pom.xml
    M connectors/pom.xml
    M connectors/sandbox/pom.xml
    M connectors/sandbox/translator-logger/pom.xml
    M connectors/sandbox/translator-yahoo/pom.xml
    M connectors/simpledb-api/pom.xml
    M connectors/translator-accumulo/pom.xml
    M connectors/translator-cassandra/pom.xml
    M connectors/translator-excel/pom.xml
    M connectors/translator-file/pom.xml
    M connectors/translator-google/pom.xml
    M connectors/translator-hbase/pom.xml
    M connectors/translator-hive/pom.xml
    M connectors/translator-infinispan-cache/pom.xml
    M connectors/translator-infinispan-dsl/pom.xml
    M connectors/translator-jdbc/pom.xml
    M connectors/translator-jpa/pom.xml
    M connectors/translator-ldap/pom.xml
    M connectors/translator-loopback/pom.xml
    M connectors/translator-mongodb/pom.xml
    M connectors/translator-object/pom.xml
    M connectors/translator-odata/pom.xml
    M connectors/translator-odata4/pom.xml
    M connectors/translator-olap/pom.xml
    M connectors/translator-prestodb/pom.xml
    M connectors/translator-salesforce-34/pom.xml
    M connectors/translator-salesforce/pom.xml
    M connectors/translator-simpledb/pom.xml
    M connectors/translator-solr/pom.xml
    M connectors/translator-ws/pom.xml
    M eclipselink-platform/pom.xml
    M engine/pom.xml
    M hibernate-dialect/pom.xml
    M jboss-admin/pom.xml
    M jboss-integration/pom.xml
    M jboss-security/pom.xml
    M metadata/pom.xml
    M odata/pom.xml
    M olingo-common/pom.xml
    M olingo-patches/pom.xml
    M olingo/pom.xml
    M pom.xml
    M runtime/pom.xml
    M teiid-jdbc/dependency-reduced-pom.xml
    M teiid-jdbc/pom.xml
    M test-integration/common/pom.xml
    M test-integration/db/pom.xml
    M test-integration/perf/pom.xml
    M test-integration/pom.xml

  Log Message:
  -----------
  changed version to 8.12.1.6_4


  Commit: d99a1bb6e1820cd6ed90d35b087ac79736978e89
      https://github.com/teiid/teiid/commit/d99a1bb6e1820cd6ed90d35b087ac79736978e89
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M admin/pom.xml
    M adminshell/pom.xml
    M api/pom.xml
    M build/pom.xml
    M client-jdk15/pom.xml
    M client/pom.xml
    M common-core/pom.xml
    M connectors/connector-accumulo/pom.xml
    M connectors/connector-cassandra/pom.xml
    M connectors/connector-file/pom.xml
    M connectors/connector-google/pom.xml
    M connectors/connector-infinispan-dsl/pom.xml
    M connectors/connector-infinispan.6/pom.xml
    M connectors/connector-ldap/pom.xml
    M connectors/connector-mongodb/pom.xml
    M connectors/connector-salesforce-34/pom.xml
    M connectors/connector-salesforce/pom.xml
    M connectors/connector-simpledb/pom.xml
    M connectors/connector-solr/pom.xml
    M connectors/connector-ws/pom.xml
    M connectors/google-api/pom.xml
    M connectors/mongodb-api/pom.xml
    M connectors/pom.xml
    M connectors/sandbox/pom.xml
    M connectors/sandbox/translator-logger/pom.xml
    M connectors/sandbox/translator-yahoo/pom.xml
    M connectors/simpledb-api/pom.xml
    M connectors/translator-accumulo/pom.xml
    M connectors/translator-cassandra/pom.xml
    M connectors/translator-excel/pom.xml
    M connectors/translator-file/pom.xml
    M connectors/translator-google/pom.xml
    M connectors/translator-hbase/pom.xml
    M connectors/translator-hive/pom.xml
    M connectors/translator-infinispan-cache/pom.xml
    M connectors/translator-infinispan-dsl/pom.xml
    M connectors/translator-jdbc/pom.xml
    M connectors/translator-jpa/pom.xml
    M connectors/translator-ldap/pom.xml
    M connectors/translator-loopback/pom.xml
    M connectors/translator-mongodb/pom.xml
    M connectors/translator-object/pom.xml
    M connectors/translator-odata/pom.xml
    M connectors/translator-odata4/pom.xml
    M connectors/translator-olap/pom.xml
    M connectors/translator-prestodb/pom.xml
    M connectors/translator-salesforce-34/pom.xml
    M connectors/translator-salesforce/pom.xml
    M connectors/translator-simpledb/pom.xml
    M connectors/translator-solr/pom.xml
    M connectors/translator-ws/pom.xml
    M eclipselink-platform/pom.xml
    M engine/pom.xml
    M hibernate-dialect/pom.xml
    M jboss-admin/pom.xml
    M jboss-integration/pom.xml
    M jboss-security/pom.xml
    M metadata/pom.xml
    M odata/pom.xml
    M olingo-common/pom.xml
    M olingo-patches/pom.xml
    M olingo/pom.xml
    M pom.xml
    M runtime/pom.xml
    M teiid-jdbc/dependency-reduced-pom.xml
    M teiid-jdbc/pom.xml
    M test-integration/common/pom.xml
    M test-integration/db/pom.xml
    M test-integration/perf/pom.xml
    M test-integration/pom.xml

  Log Message:
  -----------
  changed version to 8.12.11.6_4


  Commit: e8c297a8c5cb7dd1a448e73b8f6f64db2b2c06b5
      https://github.com/teiid/teiid/commit/e8c297a8c5cb7dd1a448e73b8f6f64db2b2c06b5
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-03-14 (Tue, 14 Mar 2017)

  Changed paths:
    M admin/pom.xml
    M adminshell/pom.xml
    M api/pom.xml
    M build/pom.xml
    M client-jdk15/pom.xml
    M client/pom.xml
    M common-core/pom.xml
    M connectors/connector-accumulo/pom.xml
    M connectors/connector-cassandra/pom.xml
    M connectors/connector-file/pom.xml
    M connectors/connector-google/pom.xml
    M connectors/connector-infinispan-dsl/pom.xml
    M connectors/connector-infinispan.6/pom.xml
    M connectors/connector-ldap/pom.xml
    M connectors/connector-mongodb/pom.xml
    M connectors/connector-salesforce-34/pom.xml
    M connectors/connector-salesforce/pom.xml
    M connectors/connector-simpledb/pom.xml
    M connectors/connector-solr/pom.xml
    M connectors/connector-ws/pom.xml
    M connectors/google-api/pom.xml
    M connectors/mongodb-api/pom.xml
    M connectors/pom.xml
    M connectors/sandbox/pom.xml
    M connectors/sandbox/translator-logger/pom.xml
    M connectors/sandbox/translator-yahoo/pom.xml
    M connectors/simpledb-api/pom.xml
    M connectors/translator-accumulo/pom.xml
    M connectors/translator-cassandra/pom.xml
    M connectors/translator-excel/pom.xml
    M connectors/translator-file/pom.xml
    M connectors/translator-google/pom.xml
    M connectors/translator-hbase/pom.xml
    M connectors/translator-hive/pom.xml
    M connectors/translator-infinispan-cache/pom.xml
    M connectors/translator-infinispan-dsl/pom.xml
    M connectors/translator-jdbc/pom.xml
    M connectors/translator-jpa/pom.xml
    M connectors/translator-ldap/pom.xml
    M connectors/translator-loopback/pom.xml
    M connectors/translator-mongodb/pom.xml
    M connectors/translator-object/pom.xml
    M connectors/translator-odata/pom.xml
    M connectors/translator-odata4/pom.xml
    M connectors/translator-olap/pom.xml
    M connectors/translator-prestodb/pom.xml
    M connectors/translator-salesforce-34/pom.xml
    M connectors/translator-salesforce/pom.xml
    M connectors/translator-simpledb/pom.xml
    M connectors/translator-solr/pom.xml
    M connectors/translator-ws/pom.xml
    M eclipselink-platform/pom.xml
    M engine/pom.xml
    M hibernate-dialect/pom.xml
    M jboss-admin/pom.xml
    M jboss-integration/pom.xml
    M jboss-security/pom.xml
    M metadata/pom.xml
    M odata/pom.xml
    M olingo-common/pom.xml
    M olingo-patches/pom.xml
    M olingo/pom.xml
    M pom.xml
    M runtime/pom.xml
    M teiid-jdbc/dependency-reduced-pom.xml
    M teiid-jdbc/pom.xml
    M test-integration/common/pom.xml
    M test-integration/db/pom.xml
    M test-integration/perf/pom.xml
    M test-integration/pom.xml

  Log Message:
  -----------
  64 8.12.x (#926)

* changed version to 8.12.1.6_4

* changed version to 8.12.11.6_4


  Commit: dd1737e32e33d52630971cb18d9372f73f084b03
      https://github.com/teiid/teiid/commit/dd1737e32e33d52630971cb18d9372f73f084b03
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-03-29 (Wed, 29 Mar 2017)

  Changed paths:
    M connectors/translator-prestodb/src/main/java/org/teiid/translator/prestodb/PrestoDBExecutionFactory.java
    M connectors/translator-prestodb/src/main/java/org/teiid/translator/prestodb/PrestoDBMetadataProcessor.java
    A connectors/translator-prestodb/src/test/java/org/teiid/translator/prestodb/TestSQLConversionVisitor.java
    A connectors/translator-prestodb/src/test/resources/sample.ddl

  Log Message:
  -----------
  TEIID_4836 back porting PrestoDB from upstream


  Commit: c3f550de4c16cf6d822a907beb9364b066b142df
      https://github.com/teiid/teiid/commit/c3f550de4c16cf6d822a907beb9364b066b142df
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  TEIID-4841 remove the jboss-logging-generator dependency, not needed


  Commit: 8a883ea5578f0303b9651ef18408c68d31d7ed29
      https://github.com/teiid/teiid/commit/8a883ea5578f0303b9651ef18408c68d31d7ed29
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/transport/SSLAwareChannelHandler.java

  Log Message:
  -----------
  TEIID-4842 closing on an ssl exception


  Commit: b16ebcaf7f1c5d7a8935593f473083e2db46f8e0
      https://github.com/teiid/teiid/commit/b16ebcaf7f1c5d7a8935593f473083e2db46f8e0
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M engine/src/test/java/org/teiid/query/processor/TestGeometry.java
    M pom.xml

  Log Message:
  -----------
  TEIID-4828 fixing geojson issue


  Commit: 0929ec2ad713a822aa689610d3e20fd9ff19dafd
      https://github.com/teiid/teiid/commit/0929ec2ad713a822aa689610d3e20fd9ff19dafd
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
    M engine/src/test/java/org/teiid/query/parser/TestParser.java

  Log Message:
  -----------
  TEIID-4830 adding geometry as an identifier
# Conflicts:
#	engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj

# Conflicts:
#	engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
#	engine/src/test/java/org/teiid/query/parser/TestParser.java


  Commit: 3e768534c77c62e01dd2b949b227de994d8d7b88
      https://github.com/teiid/teiid/commit/3e768534c77c62e01dd2b949b227de994d8d7b88
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch '64-8.12.x-teiid-4841' of https://github.com/vhalbert/teiid into 64-8.12.x


  Commit: ab1bb242c54e713538e134406ee6191677496152
      https://github.com/teiid/teiid/commit/ab1bb242c54e713538e134406ee6191677496152
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/odata/api/Client.java
    M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java

  Log Message:
  -----------
  TEIID-4231 better handling for a non-active vdb
# Conflicts:
#	test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java


  Commit: 64aa1ac125bf8c5f7c5520cbd185c293a51ce911
      https://github.com/teiid/teiid/commit/64aa1ac125bf8c5f7c5520cbd185c293a51ce911
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M odata/src/main/java/org/teiid/odata/LocalClient.java
    M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java

  Log Message:
  -----------
  TEIID-4231 adding a check for active


  Commit: 1855ee720ee4b93327f72e32612eba85223dcc03
      https://github.com/teiid/teiid/commit/1855ee720ee4b93327f72e32612eba85223dcc03
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestDeployment.java

  Log Message:
  -----------
  TEIID-4843 ignoring the test


  Commit: c46ace62f17811a7d1ab555ad04d4c7cde696a64
      https://github.com/teiid/teiid/commit/c46ace62f17811a7d1ab555ad04d4c7cde696a64
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M connectors/translator-prestodb/src/main/java/org/teiid/translator/prestodb/PrestoDBExecutionFactory.java
    M connectors/translator-prestodb/src/main/java/org/teiid/translator/prestodb/PrestoDBMetadataProcessor.java
    A connectors/translator-prestodb/src/test/java/org/teiid/translator/prestodb/TestSQLConversionVisitor.java
    A connectors/translator-prestodb/src/test/resources/sample.ddl

  Log Message:
  -----------
  Merge branch 'teiid-4836' of https://github.com/vhalbert/teiid into 64-8.12.x


  Commit: 12afebd1d689464d10c4be7f6f1ac03c5b7b6fe9
      https://github.com/teiid/teiid/commit/12afebd1d689464d10c4be7f6f1ac03c5b7b6fe9
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  TEIID-4828 downgrading the dependency


  Commit: 6fb85c7d1d0aab7548050221a068d0ad32abff18
      https://github.com/teiid/teiid/commit/6fb85c7d1d0aab7548050221a068d0ad32abff18
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M connectors/connector-salesforce-34/kits/jboss-as7-dist.xml
    M connectors/connector-salesforce-34/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/salesforce-34/main/module.xml
    M connectors/connector-salesforce-34/pom.xml
    A connectors/connector-salesforce-34/src/main/java/org/teiid/resource/adapter/salesforce/transport/SalesforceCXFTransport.java
    M connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/transport/SalesforceConnectorConfig.java
    M pom.xml

  Log Message:
  -----------
  TEIID-4495 backporting saleforce 34 fixes


  Commit: bddafb367d555661d775c9963cb8525ce630ada6
      https://github.com/teiid/teiid/commit/bddafb367d555661d775c9963cb8525ce630ada6
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
    M engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java

  Log Message:
  -----------
  TEIID-4608 backport


  Commit: b7d5d2900f60f870a5361a6511ae072f0db317b1
      https://github.com/teiid/teiid/commit/b7d5d2900f60f870a5361a6511ae072f0db317b1
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseIQExecutionFactory.java
    M connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseIQTranslator.java

  Log Message:
  -----------
  TEIID-4651 backport


  Commit: c9f26c9ce984f43ede792ca11ec3b08693f3477f
      https://github.com/teiid/teiid/commit/c9f26c9ce984f43ede792ca11ec3b08693f3477f
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M connectors/connector-salesforce-34/kits/jboss-as7-dist.xml
    M connectors/connector-salesforce-34/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/salesforce-34/main/module.xml
    M connectors/connector-salesforce-34/pom.xml
    A connectors/connector-salesforce-34/src/main/java/org/teiid/resource/adapter/salesforce/transport/SalesforceCXFTransport.java
    A connectors/connector-salesforce-34/src/main/rar/META-INF/ra.xml
    M connectors/connector-salesforce/src/main/java/org/teiid/resource/adapter/salesforce/transport/SalesforceConnectorConfig.java
    M pom.xml

  Log Message:
  -----------
  Merge branch 'teiid-4495-backport' of https://github.com/vhalbert/teiid
into 64-8.12.x


  Commit: 278906c7e4b12cec06d479dfdbdf3db353286900
      https://github.com/teiid/teiid/commit/278906c7e4b12cec06d479dfdbdf3db353286900
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
    M engine/src/test/java/org/teiid/query/processor/TestInsertProcessing.java

  Log Message:
  -----------
  Merge branch 'teiid-4608-backport' of https://github.com/vhalbert/teiid into 64-8.12.x


  Commit: 168c82a1a3691fd4a7ea948d5100b4c917da9ce1
      https://github.com/teiid/teiid/commit/168c82a1a3691fd4a7ea948d5100b4c917da9ce1
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/SybaseIQExecutionFactory.java
    M connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sybase/TestSybaseIQTranslator.java

  Log Message:
  -----------
  Merge branch 'teiid-4651-backport' of https://github.com/vhalbert/teiid into 64-8.12.x


  Commit: 136477c573eab7eb8dfe58195924e6880ff8a8ae
      https://github.com/teiid/teiid/commit/136477c573eab7eb8dfe58195924e6880ff8a8ae
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetDeleteVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetSQLVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetUpdateVisitor.java
    M connectors/translator-google/src/test/java/org/teiid/translator/google/TestSQLtoSpreadsheetQuery.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
    M pom.xml

  Log Message:
  -----------
  TEIID-4468 backport


  Commit: 99d00e295974e9eac563cf4312d8288b1ab458e3
      https://github.com/teiid/teiid/commit/99d00e295974e9eac563cf4312d8288b1ab458e3
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetDeleteVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetSQLVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetUpdateVisitor.java
    M connectors/translator-google/src/test/java/org/teiid/translator/google/TestSQLtoSpreadsheetQuery.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java
    M pom.xml

  Log Message:
  -----------
  Merge branch 'teiid-4468-64' of https://github.com/vhalbert/teiid into 64-8.12.x


  Commit: f44d970b9b8287e2798d634cab8eea2550e664b4
      https://github.com/teiid/teiid/commit/f44d970b9b8287e2798d634cab8eea2550e664b4
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-4754 ensuring the right foreign key is used
# Conflicts:
#	olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java


  Commit: 1380b7b0735a9588714cbc800d5d3a24a1d15a65
      https://github.com/teiid/teiid/commit/1380b7b0735a9588714cbc800d5d3a24a1d15a65
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-13 (Thu, 13 Apr 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/ReferenceUpdateSQLBuilder.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java

  Log Message:
  -----------
  TEIID-4852 ensuring the correct fk is used


  Commit: f7f05292440de1404b519c7365adb47d9243fdf6
      https://github.com/teiid/teiid/commit/f7f05292440de1404b519c7365adb47d9243fdf6
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheRAConnection.java
    M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanCacheWrapper.java
    M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/InfinispanManagedConnectionFactory.java
    M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/local/LocalCacheConnection.java
    M connectors/connector-infinispan.6/src/main/java/org/teiid/resource/adapter/infinispan/remote/RemoteCacheConnection.java
    M connectors/connector-infinispan.6/src/test/java/org/teiid/resource/adapter/infinispan/TestInfinispanManagedConnectionFactory.java

  Log Message:
  -----------
  TEIID-4808 fix NPE due to changes related to forceCleanup being added for scaling purposes (#940)


  Commit: 0a8decaa13414eb6b0f27af2384703bd7f2711ed
      https://github.com/teiid/teiid/commit/0a8decaa13414eb6b0f27af2384703bd7f2711ed
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M connectors/connector-google/src/main/java/org/teiid/resource/adapter/google/SpreadsheetConnectionImpl.java
    R connectors/google-api/src/main/java/org/teiid/resource/adapter/google/common/GDataAPI.java
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/dataprotocol/GoogleDataProtocolAPI.java
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/gdata/GDataClientLoginAPI.java
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/gdata/SpreadsheetMetadataExtractor.java
    R connectors/google-api/src/test/java/org/teiid/resource/adapter/google/integration/AuthenticationTest.java
    M connectors/google-api/src/test/java/org/teiid/resource/adapter/google/integration/MetadataLoadingTest.java

  Log Message:
  -----------
  TEIID-4824 light refactoring to make it easier to use the sheet key
# Conflicts:
#	connectors/google-api/src/main/java/org/teiid/resource/adapter/google/common/GDataAPI.java
#	connectors/google-api/src/main/java/org/teiid/resource/adapter/google/dataprotocol/GoogleDataProtocolAPI.java
#	connectors/google-api/src/test/java/org/teiid/resource/adapter/google/integration/AuthenticationTest.java


  Commit: b9974687064a5b5071da97f12947b63a444b7ae3
      https://github.com/teiid/teiid/commit/b9974687064a5b5071da97f12947b63a444b7ae3
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M connectors/connector-google/src/main/java/org/teiid/resource/adapter/google/SpreadsheetConnectionImpl.java
    M connectors/connector-google/src/main/java/org/teiid/resource/adapter/google/SpreadsheetManagedConnectionFactory.java
    M connectors/connector-google/src/main/rar/META-INF/ra.xml
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/gdata/GDataClientLoginAPI.java
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/gdata/SpreadsheetMetadataExtractor.java
    M connectors/google-api/src/test/java/org/teiid/resource/adapter/google/integration/MetadataLoadingTest.java

  Log Message:
  -----------
  TEIID-4824 adding a key name option
# Conflicts:
#	connectors/connector-google/src/main/java/org/teiid/resource/adapter/google/SpreadsheetConnectionImpl.java
#	connectors/connector-google/src/main/java/org/teiid/resource/adapter/google/SpreadsheetManagedConnectionFactory.java


  Commit: 1724c4cdf02624e42c67bcc8202267dd64a72871
      https://github.com/teiid/teiid/commit/1724c4cdf02624e42c67bcc8202267dd64a72871
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-04-25 (Tue, 25 Apr 2017)

  Changed paths:
    M connectors/translator-google/src/main/java/org/teiid/translator/google/GoogleMetadataProcessor.java
    M connectors/translator-google/src/main/resources/org/teiid/translator/google/i18n.properties
    A connectors/translator-google/src/test/java/org/teiid/translator/google/TestMetadataProcessor.java

  Log Message:
  -----------
  TEIID-4434 omitting columns without a label


  Commit: cdfc45f9c0e9bdafd691f47302bda720540d0ab3
      https://github.com/teiid/teiid/commit/cdfc45f9c0e9bdafd691f47302bda720540d0ab3
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-04-28 (Fri, 28 Apr 2017)

  Changed paths:
    M connectors/translator-google/src/test/java/org/teiid/translator/google/TestMetadataProcessor.java

  Log Message:
  -----------
  Fix unit test (#946)


  Commit: 4a723b38d8b09b9763d1e1bad71d50ae2f6744a4
      https://github.com/teiid/teiid/commit/4a723b38d8b09b9763d1e1bad71d50ae2f6744a4
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M api/src/main/java/org/teiid/metadata/MetadataFactory.java
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/couchbase.xml
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/create-couchbase-ds.cli
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/create-couchbase-ds.properties
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/readme.txt
    A connectors/connector-couchbase/.gitignore
    A connectors/connector-couchbase/kits/embedded-dist.xml
    A connectors/connector-couchbase/kits/jboss-as7-dist.xml
    A connectors/connector-couchbase/kits/jboss-as7/modules/com/couchbase/client/main/module.xml
    A connectors/connector-couchbase/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/couchbase/main/META-INF/MANIFEST.MF
    A connectors/connector-couchbase/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/couchbase/main/META-INF/ra.xml
    A connectors/connector-couchbase/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/couchbase/main/module.xml
    A connectors/connector-couchbase/pom.xml
    A connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseConnectionImpl.java
    A connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseManagedConnectionFactory.java
    A connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseResourceAdapter.java
    A connectors/connector-couchbase/src/main/rar/META-INF/MANIFEST.MF
    A connectors/connector-couchbase/src/main/rar/META-INF/ra.xml
    A connectors/connector-couchbase/src/main/resources/org/teiid/resource/adapter/couchbase/i18n.properties
    A connectors/connector-couchbase/src/test/java/org/teiid/resource/adapter/couchbase/TestCouchbaseConnection.java
    A connectors/couchbase-api/.gitignore
    A connectors/couchbase-api/pom.xml
    A connectors/couchbase-api/src/main/java/org/teiid/couchbase/CouchbaseConnection.java
    M connectors/pom.xml
    A connectors/translator-couchbase/.gitignore
    A connectors/translator-couchbase/kits/embedded-dist.xml
    A connectors/translator-couchbase/kits/jboss-as7-dist.xml
    A connectors/translator-couchbase/kits/jboss-as7/modules/org/jboss/teiid/translator/couchbase/api/main/module.xml
    A connectors/translator-couchbase/kits/jboss-as7/modules/org/jboss/teiid/translator/couchbase/main/module.xml
    A connectors/translator-couchbase/pom.xml
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseDirectQueryExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseProcedureExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseProperties.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseUpdateExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    A connectors/translator-couchbase/src/main/resources/META-INF/services/org.teiid.translator.ExecutionFactory
    A connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbaseMetadataProcessor.java
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestVisitor.java
    A connectors/translator-couchbase/src/test/resources/N1QL.properties
    A connectors/translator-couchbase/src/test/resources/complexJson.expected
    A connectors/translator-couchbase/src/test/resources/complexJsonNestedArray.expected
    A connectors/translator-couchbase/src/test/resources/customerDuplicatedTypedName.expected
    A connectors/translator-couchbase/src/test/resources/customerOrder.expected
    A connectors/translator-couchbase/src/test/resources/customerOrderTypedName.expected
    A connectors/translator-couchbase/src/test/resources/dataTypeJson.expected
    A connectors/translator-couchbase/src/test/resources/nestedArray.expected
    A connectors/translator-couchbase/src/test/resources/nestedJson.expected
    A connectors/translator-couchbase/src/test/resources/nestedJsonTypedName.expected
    A connectors/translator-couchbase/src/test/resources/nullValue.expected
    A connectors/translator-couchbase/src/test/resources/procedures.expected
    M pom.xml

  Log Message:
  -----------
  TEIID-2820 backport, but will only build if unit test are not run -Dmaven.test.skip=true, those will be fixed in the next commit


  Commit: 8129b8f6e9766bc6e8d33eec1f75400e9b751df4
      https://github.com/teiid/teiid/commit/8129b8f6e9766bc6e8d33eec1f75400e9b751df4
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M connectors/connector-salesforce-34/kits/jboss-as7-dist.xml
    M connectors/connector-salesforce-34/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/salesforce-34/main/module.xml
    M connectors/connector-salesforce-34/pom.xml

  Log Message:
  -----------
  TEIID-4495 TEIID-4876 fixing salesforce-34 resource adapter


  Commit: 85185b3091ad77b67777f1f1151f4ca6f9ab853f
      https://github.com/teiid/teiid/commit/85185b3091ad77b67777f1f1151f4ca6f9ab853f
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  TEIID-4867 upgrading the olingo version (#948)


  Commit: 2061fb5e20f23f29245f367992ec1a235481f7ce
      https://github.com/teiid/teiid/commit/2061fb5e20f23f29245f367992ec1a235481f7ce
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M api/src/main/java/org/teiid/metadata/MetadataFactory.java
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/couchbase.xml
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/create-couchbase-ds.cli
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/create-couchbase-ds.properties
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/couchbase/readme.txt
    A connectors/connector-couchbase/.gitignore
    A connectors/connector-couchbase/kits/embedded-dist.xml
    A connectors/connector-couchbase/kits/jboss-as7-dist.xml
    A connectors/connector-couchbase/kits/jboss-as7/modules/com/couchbase/client/main/module.xml
    A connectors/connector-couchbase/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/couchbase/main/META-INF/MANIFEST.MF
    A connectors/connector-couchbase/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/couchbase/main/META-INF/ra.xml
    A connectors/connector-couchbase/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/couchbase/main/module.xml
    A connectors/connector-couchbase/pom.xml
    A connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseConnectionImpl.java
    A connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseManagedConnectionFactory.java
    A connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseResourceAdapter.java
    A connectors/connector-couchbase/src/main/rar/META-INF/MANIFEST.MF
    A connectors/connector-couchbase/src/main/rar/META-INF/ra.xml
    A connectors/connector-couchbase/src/main/resources/org/teiid/resource/adapter/couchbase/i18n.properties
    A connectors/connector-couchbase/src/test/java/org/teiid/resource/adapter/couchbase/TestCouchbaseConnection.java
    A connectors/couchbase-api/.gitignore
    A connectors/couchbase-api/pom.xml
    A connectors/couchbase-api/src/main/java/org/teiid/couchbase/CouchbaseConnection.java
    M connectors/pom.xml
    A connectors/translator-couchbase/.gitignore
    A connectors/translator-couchbase/kits/embedded-dist.xml
    A connectors/translator-couchbase/kits/jboss-as7-dist.xml
    A connectors/translator-couchbase/kits/jboss-as7/modules/org/jboss/teiid/translator/couchbase/api/main/module.xml
    A connectors/translator-couchbase/kits/jboss-as7/modules/org/jboss/teiid/translator/couchbase/main/module.xml
    A connectors/translator-couchbase/pom.xml
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseDirectQueryExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseProcedureExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseProperties.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseUpdateExecution.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    A connectors/translator-couchbase/src/main/resources/META-INF/services/org.teiid.translator.ExecutionFactory
    A connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbaseMetadataProcessor.java
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestVisitor.java
    A connectors/translator-couchbase/src/test/resources/N1QL.properties
    A connectors/translator-couchbase/src/test/resources/complexJson.expected
    A connectors/translator-couchbase/src/test/resources/complexJsonNestedArray.expected
    A connectors/translator-couchbase/src/test/resources/customerDuplicatedTypedName.expected
    A connectors/translator-couchbase/src/test/resources/customerOrder.expected
    A connectors/translator-couchbase/src/test/resources/customerOrderTypedName.expected
    A connectors/translator-couchbase/src/test/resources/dataTypeJson.expected
    A connectors/translator-couchbase/src/test/resources/nestedArray.expected
    A connectors/translator-couchbase/src/test/resources/nestedJson.expected
    A connectors/translator-couchbase/src/test/resources/nestedJsonTypedName.expected
    A connectors/translator-couchbase/src/test/resources/nullValue.expected
    A connectors/translator-couchbase/src/test/resources/procedures.expected
    M pom.xml

  Log Message:
  -----------
  Merge branch 'teiid-2820-backport' of https://github.com/vhalbert/teiid
into 64-8.12.x


  Commit: 63a43d41ca341cb3d61536aac436a59a21c73a74
      https://github.com/teiid/teiid/commit/63a43d41ca341cb3d61536aac436a59a21c73a74
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch '64-8.12.x' of github.com:teiid/teiid into 64-8.12.x


  Commit: 678b17bec7a4d3d6469de3827b56c1efba473dec
      https://github.com/teiid/teiid/commit/678b17bec7a4d3d6469de3827b56c1efba473dec
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli

  Log Message:
  -----------
  TEIID-4495 correcting the cli


  Commit: d73953a5beb2d966eeafb57687af615a14d0d206
      https://github.com/teiid/teiid/commit/d73953a5beb2d966eeafb57687af615a14d0d206
  Author: jolee <jolee at redhat.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M api/src/main/java/org/teiid/metadata/BaseColumn.java
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/metadata/DDLStringVisitor.java
    M engine/src/main/java/org/teiid/query/parser/SQLParserUtil.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSchemaBuilder.java
    M olingo/src/test/resources/loopy-edmx-metadata.xml
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetProcedureColumns.expected
    A test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected

  Log Message:
  -----------
  TEIID-4446: rationalizing precision/scale metadata

# Conflicts:
#	build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html


  Commit: 22235fee310bc090f17e085c6608c7dcc5abd99a
      https://github.com/teiid/teiid/commit/22235fee310bc090f17e085c6608c7dcc5abd99a
  Author: jolee <jolee at redhat.com>
  Date:   2017-05-17 (Wed, 17 May 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/processor/relational/DependentAccessNode.java
    M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java

  Log Message:
  -----------
  TEIID-4722: TEIID30019: java.lang.AssertionError: Assertion failed assertion due to guard against a corner condition. (preventing an assertion error)


  Commit: c5a45d2dc9cd6687667bf7f3ed9b1badfc23e049
      https://github.com/teiid/teiid/commit/c5a45d2dc9cd6687667bf7f3ed9b1badfc23e049
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleConstants.java
    A engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushLargeIn.java
    M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java

  Log Message:
  -----------
  BZ1417982 (6.3.6) + TEIID-4901: Add parallel source query handling for when IN criteria values exceed MaxInCriteriaSize for translator (pushing large in as dependent set) (#954)


  Commit: 2829bc60c0e4e9d02dde3e7614eb6e8bcf9ca6a0
      https://github.com/teiid/teiid/commit/2829bc60c0e4e9d02dde3e7614eb6e8bcf9ca6a0
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java
    M engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java
    M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java

  Log Message:
  -----------
  TEIID-4875: Planning issue with multiple aggregate decompositions through a join tree (fixing aggregate planning issue) (#955)


  Commit: 5b7ca632d185845e120e1ff2cd10a215bfa9209c
      https://github.com/teiid/teiid/commit/5b7ca632d185845e120e1ff2cd10a215bfa9209c
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleConstants.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java
    A engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushLargeIn.java
    M engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java
    M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java
    M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java

  Log Message:
  -----------
  Merge branch '64-8.12.x' of github.com:teiid/teiid into 64-8.12.x

# Conflicts:
#	engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java


  Commit: 7b40d68d31b2480daef649aa288dcc313ff5b30b
      https://github.com/teiid/teiid/commit/7b40d68d31b2480daef649aa288dcc313ff5b30b
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    A build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-ha-mode-install.cli

  Log Message:
  -----------
  TEIID-4914 adding cli script to install into ha and full-ha profiles, this has the change to the internal infinispan teiid cache to replicated (#957)


  Commit: 036625dbd8e270fd24f244ed1f09d97cf32774d8
      https://github.com/teiid/teiid/commit/036625dbd8e270fd24f244ed1f09d97cf32774d8
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M connectors/connector-solr/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/solr/main/module.xml
    M connectors/translator-solr/kits/jboss-as7-dist.xml
    R connectors/translator-solr/kits/jboss-as7/modules/org/apache/solr/main/module.xml
    A connectors/translator-solr/kits/jboss-as7/modules/org/apache/solr/teiid/module.xml
    M connectors/translator-solr/kits/jboss-as7/modules/org/jboss/teiid/translator/solr/main/module.xml

  Log Message:
  -----------
  TEIID-4917 changing teiids version of solr module to be in the teiid slot (#958)


  Commit: 9080ac2c69a959065220c3bf4084f72075009c7d
      https://github.com/teiid/teiid/commit/9080ac2c69a959065220c3bf4084f72075009c7d
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sqlserver/SQLServerExecutionFactory.java

  Log Message:
  -----------
  TEIID-4874: SQL Server translator should support full outer join by
default (changing default support for full outer join)

# Conflicts:
#	build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html


  Commit: 2e1f4a637ac6f58fde61297ac2df155a7cbc30e8
      https://github.com/teiid/teiid/commit/2e1f4a637ac6f58fde61297ac2df155a7cbc30e8
  Author: jolee <jolee at redhat.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M client/src/main/java/org/teiid/net/socket/Handshake.java
    M client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
    M common-core/src/main/java/org/teiid/core/crypto/BasicCryptor.java
    M common-core/src/main/java/org/teiid/core/crypto/DhKeyGenerator.java
    M common-core/src/main/java/org/teiid/core/crypto/SymmetricCryptor.java
    M common-core/src/test/java/org/teiid/core/crypto/TestDhKeyGenerator.java
    M common-core/src/test/java/org/teiid/core/crypto/TestEncryptDecrypt.java
    M runtime/src/main/java/org/teiid/transport/SocketClientInstance.java

  Log Message:
  -----------
  TEIID-4663: Support a more secure block mode for client/server
encryption (defaulting to cbc with an explicit init vector)

# Conflicts:
#	build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html


  Commit: 8008b1cd6096ed46f23850f1a84b32b0e30237c0
      https://github.com/teiid/teiid/commit/8008b1cd6096ed46f23850f1a84b32b0e30237c0
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

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

  Log Message:
  -----------
  TEIID-4732: Teiid Server does not honor columns name in external
materialization (using the column names in inserts)

# Conflicts:
#	build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html


  Commit: 80c16c15939f518f97ca5e0e9e1cd7b43dd78a39
      https://github.com/teiid/teiid/commit/80c16c15939f518f97ca5e0e9e1cd7b43dd78a39
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-05-18 (Thu, 18 May 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
    M engine/src/test/java/org/teiid/common/buffer/TestSTree.java
    M pom.xml
    M test-integration/perf/src/test/java/org/teiid/query/eval/TestEnginePerformance.java

  Log Message:
  -----------
  TEIID-4819 correcting the buffermanager logic and enabling assertions
# Conflicts:
#	engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java


  Commit: 3f71a69dceef150843750eb388b863d089c758da
      https://github.com/teiid/teiid/commit/3f71a69dceef150843750eb388b863d089c758da
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2017-05-19 (Fri, 19 May 2017)

  Changed paths:
    M connectors/translator-ws/src/main/java/org/teiid/translator/ws/WSProcedureExecution.java
    M test-integration/common/src/test/java/org/teiid/arquillian/AdminUtil.java
    A test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestSOAPWebService.java
    A test-integration/common/src/test/resources/addressing-service.war
    A test-integration/common/src/test/resources/soapsvc-vdb.xml

  Log Message:
  -----------
  TEIID-4755:  WS SOAP Response with WS-A Headers results in
ClassCastException (Using the DOM based return in MESSAGE mode as CXF
does not allow StAX based Source)

# Conflicts:
#	build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html


  Commit: 123dd6af7da95340ace19c397f32232ad789b1c4
      https://github.com/teiid/teiid/commit/123dd6af7da95340ace19c397f32232ad789b1c4
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-05-24 (Wed, 24 May 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties

  Log Message:
  -----------
  TEIID-4926 backport (#961)


  Commit: 9783a6fea5fb7e936957bd80e9531879a2a91336
      https://github.com/teiid/teiid/commit/9783a6fea5fb7e936957bd80e9531879a2a91336
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-06-03 (Sat, 03 Jun 2017)

  Changed paths:
    M api/src/main/java/org/teiid/metadata/MetadataFactory.java
    M api/src/main/java/org/teiid/metadata/Schema.java

  Log Message:
  -----------
  backporting changes to support better integration with JDG 7.1. (#965)


  Commit: 590609d28e923cb675c9c42f45f55f058482c5a5
      https://github.com/teiid/teiid/commit/590609d28e923cb675c9c42f45f55f058482c5a5
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectExecution.java

  Log Message:
  -----------
  fix the NPE seen when the connection is being cleaned up


  Commit: 37dc383ecd487f4cab48dca16bb9cbb4b7557fb2
      https://github.com/teiid/teiid/commit/37dc383ecd487f4cab48dca16bb9cbb4b7557fb2
  Author: jolee <jolee at redhat.com>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M connectors/connector-infinispan-dsl/src/main/java/org/teiid/resource/adapter/infinispan/dsl/DSLSearch.java
    M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectExecution.java
    M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectPlugin.java
    M connectors/translator-object/src/main/java/org/teiid/translator/object/ObjectUpdateExecution.java
    M connectors/translator-object/src/main/resources/org/teiid/translator/object/i18n.properties

  Log Message:
  -----------
  DV 6.3.5: TEIID-4817: changed execution to catch the JDG
HotRodClientException (RuntimeException) so that the connection can be
flushed and
fix the NPE seen when the connection is being cleaned up

# Conflicts:
#	build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html


  Commit: e5de7fbd06418514b1dc51ebd0ba6114dd550628
      https://github.com/teiid/teiid/commit/e5de7fbd06418514b1dc51ebd0ba6114dd550628
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-06-07 (Wed, 07 Jun 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java
    M engine/src/test/java/org/teiid/dqp/internal/process/multisource/TestMultiSourcePlanToProcessConverter.java

  Log Message:
  -----------
  BZ1417982 + TEIID-4861: ASSERTION FAILED: expected reference to be not null (fixing partitioned multi-source aggregate pushdown under join) (#966)


  Commit: e9dc91ef14bd87c0e2e297b2878adfb5c9a26942
      https://github.com/teiid/teiid/commit/e9dc91ef14bd87c0e2e297b2878adfb5c9a26942
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-06-27 (Tue, 27 Jun 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Added profile to aggregate license files (#973)


  Commit: 337c7ed9fefa04ebd12e7b2e347269a11429f6e3
      https://github.com/teiid/teiid/commit/337c7ed9fefa04ebd12e7b2e347269a11429f6e3
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java

  Log Message:
  -----------
  TEIID-4393 correcting test


  Commit: bced828f8e4690e1709d84e862b15ba5b5987b0e
      https://github.com/teiid/teiid/commit/bced828f8e4690e1709d84e862b15ba5b5987b0e
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-06-28 (Wed, 28 Jun 2017)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge branch '64-8.12.x' of github.com:teiid/teiid into 64-8.12.x


  Commit: d08433e80c78476dbb7d2f5867cdc4b0d6ae8cdd
      https://github.com/teiid/teiid/commit/d08433e80c78476dbb7d2f5867cdc4b0d6ae8cdd
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-06-29 (Thu, 29 Jun 2017)

  Changed paths:
    M api/src/main/java/org/teiid/metadata/MetadataFactory.java

  Log Message:
  -----------
  fix infinispan metadata extension (#976)


  Commit: 2b405f455a88aaf315d050a53216a9841c7d5731
      https://github.com/teiid/teiid/commit/2b405f455a88aaf315d050a53216a9841c7d5731
  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/java/org/teiid/transport/TestODBCSocketTransport.java
    M test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    M test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testInt2Vector.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
    M test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected

  Log Message:
  -----------
  TEIID-4147 expanding types and consistently using the pg type name
# Conflicts:
#	jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
#	runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
#	test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java
#	test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
#	test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
#	test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
#	test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
#	test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
#	test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected


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

  Changed paths:
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java

  Log Message:
  -----------
  TEIID-4147 expanding types and consistently using the pg type name


  Commit: dab042b0a699573bf87b31706110968465050231
      https://github.com/teiid/teiid/commit/dab042b0a699573bf87b31706110968465050231
  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/jdbc/TestMMDatabaseMetaData.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java
    M test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    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/TestODBCSchema/testTypes.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
    M test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.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


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

  Changed paths:
    M engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
    M engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java

  Log Message:
  -----------
  TEIID-4838 fixing resolving behavior


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

  Changed paths:
    M api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/function/GeometryFunctionMethods.java
    M engine/src/main/java/org/teiid/query/function/GeometryUtils.java
    M engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java
    M engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
    M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/processor/TestGeometry.java
    M engine/src/test/java/org/teiid/query/resolver/TestResolver.java
    M engine/src/test/java/org/teiid/query/validator/TestValidator.java
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M runtime/src/main/java/org/teiid/odbc/ScriptReader.java
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
    M runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
    M runtime/src/test/java/org/teiid/odbc/TestScriptReader.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
    M test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
    M test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    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/TestMMDatabaseMetaData/testGetTables.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
    M test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected

  Log Message:
  -----------
  TEIID-4493 initial qgis support
# Conflicts:
#	connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
#	engine/src/main/java/org/teiid/query/QueryPlugin.java
#	engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
#	engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
#	engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
#	engine/src/test/java/org/teiid/query/processor/TestGeometry.java
#	runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
#	runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
#	runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
#	runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
#	test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
#	test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
#	test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
#	test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
#	test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected


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

  Changed paths:
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
    M engine/src/main/java/org/teiid/query/eval/Evaluator.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
    M engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
    M engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/main/java/org/teiid/query/sql/lang/AbstractCompareCriteria.java
    M engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java
    M engine/src/main/java/org/teiid/query/sql/navigator/PreOrPostOrderNavigator.java
    M engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/ExpressionMappingVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java
    M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
    M test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
    M test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
    M test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    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/TestMMDatabaseMetaData/testGetTables.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
    M test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected

  Log Message:
  -----------
  TEIID-3792 adding quantified comparison syntax for arrays
# Conflicts:
#	build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
#	engine/src/main/java/org/teiid/query/QueryPlugin.java
#	engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
#	engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
#	engine/src/main/resources/org/teiid/query/i18n.properties
#	engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java


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

  Changed paths:
    M api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
    M engine/src/main/java/org/teiid/query/function/GeometryFunctionMethods.java
    M engine/src/main/java/org/teiid/query/function/GeometryUtils.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/processor/TestGeometry.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
    M runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
    A runtime/src/main/java/org/teiid/transport/pg/TimestampUtils.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
    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:
  -----------
  TEIID-4493 refining support for qgis
# Conflicts:
#	connectors/jdbc/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
#	connectors/jdbc/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
#	engine/src/main/resources/org/teiid/query/i18n.properties
#	runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected


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

  Changed paths:
    M client/src/main/java/org/teiid/jdbc/StatementImpl.java
    M client/src/test/java/org/teiid/jdbc/TestStatement.java
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
    M engine/src/main/java/org/teiid/query/parser/QueryParser.java
    M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
    M engine/src/main/resources/org/teiid/metadata/SYS.sql
    M jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestPGMetadata.java
    M test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
    M test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    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/TestMMDatabaseMetaData/testGetTables.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
    M test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected

  Log Message:
  -----------
  TEIID-4578 sqlalchemy support
# Conflicts:
#	engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
#	engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
#	engine/src/main/resources/org/teiid/metadata/SYS.sql
#	jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
#	runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
#	runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
#	test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
#	test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
#	test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
#	test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
#	test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected


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

  Changed paths:
    M engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
    M engine/src/main/java/org/teiid/query/util/CommandContext.java
    M engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
    M engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
    M test-integration/common/src/test/java/org/teiid/jdbc/TestInternalConnection.java

  Log Message:
  -----------
  TEIID-4710 fixing command context request ids


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

  Changed paths:
    M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
    M engine/src/test/java/org/teiid/query/parser/TestParser.java
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M runtime/src/main/java/org/teiid/odbc/PGUtil.java
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java

  Log Message:
  -----------
  TEIID-4866 initial changes to support superset
# Conflicts:
#	runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java


  Commit: 904e9a7af60b0d2185ec038b545105b3b008894b
      https://github.com/teiid/teiid/commit/904e9a7af60b0d2185ec038b545105b3b008894b
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
    M engine/src/main/resources/org/teiid/metadata/SYS.sql
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M runtime/src/main/java/org/teiid/odbc/PGUtil.java
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
    M test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected

  Log Message:
  -----------
  TEIID-4866 more refinements of sql alchemy / superset integration
# Conflicts:
#	runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
#	runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
#	test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
#	test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
#	test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
#	test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected


  Commit: fbf87a599b48ce1d8cc7d63e91782ca5fe5d4533
      https://github.com/teiid/teiid/commit/fbf87a599b48ce1d8cc7d63e91782ca5fe5d4533
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-06-30 (Fri, 30 Jun 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
    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:
  -----------
  TEIID-4866 simplifying version function handling
# Conflicts:
#	teiid-feature-pack/wildfly-integration-feature-pack/src/main/resources/content/docs/teiid/teiid-releasenotes.html
#	test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctionColumns.expected
#	test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetFunctions.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
#	test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected


  Commit: a5d52c0795c14d005e7545de18f29f173d9ab0e7
      https://github.com/teiid/teiid/commit/a5d52c0795c14d005e7545de18f29f173d9ab0e7
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-07-05 (Wed, 05 Jul 2017)

  Changed paths:
    M api/src/main/java/org/teiid/translator/SourceSystemFunctions.java
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M client/src/main/java/org/teiid/jdbc/ResultSetImpl.java
    M client/src/main/java/org/teiid/jdbc/StatementImpl.java
    M client/src/test/java/org/teiid/jdbc/TestStatement.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teiid/TeiidExecutionFactory.java
    M engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/eval/Evaluator.java
    M engine/src/main/java/org/teiid/query/function/GeometryFunctionMethods.java
    M engine/src/main/java/org/teiid/query/function/GeometryUtils.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
    M engine/src/main/java/org/teiid/query/parser/QueryParser.java
    M engine/src/main/java/org/teiid/query/resolver/QueryResolver.java
    M engine/src/main/java/org/teiid/query/resolver/command/SimpleQueryResolver.java
    M engine/src/main/java/org/teiid/query/resolver/util/ResolverUtil.java
    M engine/src/main/java/org/teiid/query/resolver/util/ResolverVisitor.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/main/java/org/teiid/query/sql/lang/AbstractCompareCriteria.java
    M engine/src/main/java/org/teiid/query/sql/lang/SubqueryCompareCriteria.java
    M engine/src/main/java/org/teiid/query/sql/navigator/PreOrPostOrderNavigator.java
    M engine/src/main/java/org/teiid/query/sql/visitor/CommandCollectorVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/EvaluatableVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/ExpressionMappingVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/ValueIteratorProviderCollectorVisitor.java
    M engine/src/main/java/org/teiid/query/util/CommandContext.java
    M engine/src/main/java/org/teiid/query/validator/ValidationVisitor.java
    M engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
    M engine/src/main/resources/org/teiid/metadata/SYS.sql
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
    M engine/src/test/java/org/teiid/dqp/internal/process/TestDataTierManager.java
    M engine/src/test/java/org/teiid/query/parser/TestParser.java
    M engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java
    M engine/src/test/java/org/teiid/query/processor/TestGeometry.java
    M engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
    M engine/src/test/java/org/teiid/query/resolver/TestResolver.java
    M engine/src/test/java/org/teiid/query/validator/TestValidator.java
    M jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
    M runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
    M runtime/src/main/java/org/teiid/odbc/ODBCClientRemote.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemote.java
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M runtime/src/main/java/org/teiid/odbc/PGUtil.java
    M runtime/src/main/java/org/teiid/odbc/ScriptReader.java
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
    M runtime/src/main/java/org/teiid/transport/PgFrontendProtocol.java
    A runtime/src/main/java/org/teiid/transport/pg/TimestampUtils.java
    M runtime/src/test/java/org/teiid/odbc/TestScriptReader.java
    M test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
    M test-integration/common/src/test/java/org/teiid/jdbc/TestInternalConnection.java
    M test-integration/common/src/test/java/org/teiid/jdbc/TestMMDatabaseMetaData.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestODBCSchema.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestPGMetadata.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java
    M test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
    M test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
    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/TestMMDatabaseMetaData/testGetTables.expected
    M test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
    M test-integration/common/src/test/resources/TestODBCSchema/testTypes.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE_overflow.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_INDEX.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_NAMESPACE.expected
    M test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testInt2Vector.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testPgProc.expected
    M test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
    M test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctionParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testFunctions.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedureParams.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProcedures.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testReferenceKeyColumns.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testViews.expected
    M test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected

  Log Message:
  -----------
  Merge pull request #978 from shawkins/sqlalchemy-backport

Sqlalchemy backport


  Commit: 02307b1ff17b59b2d69944cf177ebcdc1070fed0
      https://github.com/teiid/teiid/commit/02307b1ff17b59b2d69944cf177ebcdc1070fed0
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-06 (Thu, 06 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java

  Log Message:
  -----------
  TEIID-3792 adding method for 1.7 builds


  Commit: 8fa9933c0c31ce4a3ec96abc658ea94810118426
      https://github.com/teiid/teiid/commit/8fa9933c0c31ce4a3ec96abc658ea94810118426
  Author: jolee <jolee at redhat.com>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
    M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java

  Log Message:
  -----------
  TEIID-4976: criteria duplicated when criteria includes the same columns as dependent join criteria (removing duplicate criteria)


  Commit: d2be2861f66e0cdfbac3a0ed049384c734919662
      https://github.com/teiid/teiid/commit/d2be2861f66e0cdfbac3a0ed049384c734919662
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-07 (Fri, 07 Jul 2017)

  Changed paths:
    M api/src/main/java/org/teiid/language/visitor/HierarchyVisitor.java
    M connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseConnectionImpl.java
    M connectors/connector-couchbase/src/main/resources/org/teiid/resource/adapter/couchbase/i18n.properties
    M connectors/connector-couchbase/src/test/java/org/teiid/resource/adapter/couchbase/TestCouchbaseConnection.java
    M connectors/couchbase-api/src/main/java/org/teiid/couchbase/CouchbaseConnection.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseDirectQueryExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseProcedureExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseUpdateExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties

  Log Message:
  -----------
  TEIID-4967 TEIID-4969 TEIID-4970 TEIID-4972 TEIID-4973 TEIID-4974
TEIID-4975 addressing various couchbase issues
# Conflicts:
#	connectors/connector-couchbase/src/test/java/org/teiid/resource/adapter/couchbase/TestCouchbaseConnection.java
#	connectors/couchbase/connector-couchbase/src/main/resources/org/teiid/resource/adapter/couchbase/i18n.properties
#	connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
#	connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
#	connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
#	connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java


  Commit: b08ed24673c37051da454f54a842d8e33ade8ab9
      https://github.com/teiid/teiid/commit/b08ed24673c37051da454f54a842d8e33ade8ab9
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties
    M connectors/translator-couchbase/src/test/resources/complexJson.expected
    M connectors/translator-couchbase/src/test/resources/complexJsonNestedArray.expected
    M connectors/translator-couchbase/src/test/resources/customerDuplicatedTypedName.expected
    M connectors/translator-couchbase/src/test/resources/customerOrder.expected
    M connectors/translator-couchbase/src/test/resources/customerOrderTypedName.expected
    M connectors/translator-couchbase/src/test/resources/dataTypeJson.expected
    M connectors/translator-couchbase/src/test/resources/nestedJson.expected
    M connectors/translator-couchbase/src/test/resources/nestedJsonTypedName.expected
    M connectors/translator-couchbase/src/test/resources/nullValue.expected

  Log Message:
  -----------
  TEIID-4983 updating ordering in the unit tests


  Commit: 4fbb80ac2e385004cb8d8103b45d7da6dd8fdc2e
      https://github.com/teiid/teiid/commit/4fbb80ac2e385004cb8d8103b45d7da6dd8fdc2e
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
    M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java

  Log Message:
  -----------
  Merge pull request #979 from vhalbert/teiid-4976-backport

Backport of TEIID-4976: criteria duplicated when criteria includes the same colums


  Commit: 5889ae311669fabb39e80b9d761c3a9087888d9b
      https://github.com/teiid/teiid/commit/5889ae311669fabb39e80b9d761c3a9087888d9b
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-10 (Mon, 10 Jul 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/test/resources/complexJson.expected

  Log Message:
  -----------
  TEIID-4986 correcting the nested array logic


  Commit: 3eb8da49b4445923b4e3b693d43c12db6478550f
      https://github.com/teiid/teiid/commit/3eb8da49b4445923b4e3b693d43c12db6478550f
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-ha-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli

  Log Message:
  -----------
  TEIID-4991 adding infinispan-hotrod translator and resource-adapter to the configurations


  Commit: 264976007f82c2df5ba906931ba9cecc6da55259
      https://github.com/teiid/teiid/commit/264976007f82c2df5ba906931ba9cecc6da55259
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java
    M test-integration/common/src/test/java/org/teiid/dqp/internal/process/TestTPCR.java
    A test-integration/common/src/test/resources/tpch.ddl

  Log Message:
  -----------
  TEIID-4988 addressing subquery merge join issue with multi-level
correlations


  Commit: fef18de7b80c288857e5591c34ee78ab2cb2088f
      https://github.com/teiid/teiid/commit/fef18de7b80c288857e5591c34ee78ab2cb2088f
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/processor/relational/DependentCriteriaProcessor.java
    M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java

  Log Message:
  -----------
  TEIID-4976 expanding to partial matches as well


  Commit: 4c99b4cc9757c81f7af12732ccdcfd3ab90d2d19
      https://github.com/teiid/teiid/commit/4c99b4cc9757c81f7af12732ccdcfd3ab90d2d19
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M olingo-common/src/main/java/org/teiid/olingo/common/ODataTypeManager.java
    M olingo/src/main/java/org/teiid/olingo/ProjectedColumn.java
    M olingo/src/main/java/org/teiid/olingo/service/ComplexDocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/OperationResponseImpl.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-4269 accounting for bigdecimal precision and scale
# Conflicts:
#	olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
#	olingo/src/main/java/org/teiid/olingo/service/OperationResponseImpl.java
#	olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java


  Commit: 5c22348f3db358f496115286f44ed83877e51d6d
      https://github.com/teiid/teiid/commit/5c22348f3db358f496115286f44ed83877e51d6d
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-ha-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli

  Log Message:
  -----------
  Merge pull request #985 from vhalbert/teiid-4991

TEIID-4991 adding infinispan-hotrod translator and resource-adapter to the configurations


  Commit: cec25b8f5f6990906b67e108e3d4b50694802458
      https://github.com/teiid/teiid/commit/cec25b8f5f6990906b67e108e3d4b50694802458
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
    M olingo/src/main/java/org/teiid/olingo/service/TeiidServiceHandler.java
    M olingo/src/main/resources/org/teiid/olingo/i18n.properties
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-4380 preventing more than a single expanded child


  Commit: 1b94659fa8632b7bb684a7562a0bbb7812d2465e
      https://github.com/teiid/teiid/commit/1b94659fa8632b7bb684a7562a0bbb7812d2465e
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/ExpandDocumentNode.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-4381 correcting count 0


  Commit: e01e04ab9ee125a39c6bddf8edb556b79317314c
      https://github.com/teiid/teiid/commit/e01e04ab9ee125a39c6bddf8edb556b79317314c
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/odata/api/QueryResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/CrossJoinResult.java
    M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java
    M olingo/src/main/java/org/teiid/olingo/service/OperationResponseImpl.java

  Log Message:
  -----------
  TEIID-4379 minor cleanup


  Commit: 94c4cd085a637fbf92a8901600420c67ab85c283
      https://github.com/teiid/teiid/commit/94c4cd085a637fbf92a8901600420c67ab85c283
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/function/aggregate/ArrayAgg.java
    M engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java

  Log Message:
  -----------
  TEIID-4382 fixing nested arrays


  Commit: 5655a751d382d17a2f096b4494e1906899215fea
      https://github.com/teiid/teiid/commit/5655a751d382d17a2f096b4494e1906899215fea
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
    M engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java

  Log Message:
  -----------
  TEIID-4385 fixing the logic to find the correlated reference
# Conflicts:
#	engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java


  Commit: 942ccdf86cee5b45985801c009d3cb408b049f24
      https://github.com/teiid/teiid/commit/942ccdf86cee5b45985801c009d3cb408b049f24
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
    M olingo/src/main/java/org/teiid/odata/api/Client.java
    M olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/ExpandDocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/TeiidServiceHandler.java
    M olingo/src/main/resources/org/teiid/olingo/i18n.properties
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java

  Log Message:
  -----------
  TEIID-4100 expanding expand support
# Conflicts:
#	jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
#	olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
#	olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
#	olingo/src/main/resources/org/teiid/olingo/i18n.properties
#	olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
#	olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java


  Commit: 129e8535be6c59c533046eeea76d5eee538e084b
      https://github.com/teiid/teiid/commit/129e8535be6c59c533046eeea76d5eee538e084b
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/odata/api/QueryResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/CrossJoinResult.java
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/OperationResponseImpl.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java

  Log Message:
  -----------
  TEIID-4387 expanding/simplifying $it support


  Commit: a68f23eb7ec577fa6e4c5a0ef96f238792cecc03
      https://github.com/teiid/teiid/commit/a68f23eb7ec577fa6e4c5a0ef96f238792cecc03
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
    M olingo/src/main/java/org/teiid/olingo/ProjectedColumn.java
    M olingo/src/main/java/org/teiid/olingo/service/ComplexDocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/ExpandSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java

  Log Message:
  -----------
  TEIID-4392 adding star support
# Conflicts:
#	olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
#	olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java


  Commit: db05a782ae185d730ce34a6c7ea84cd3d5557da4
      https://github.com/teiid/teiid/commit/db05a782ae185d730ce34a6c7ea84cd3d5557da4
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/function/aggregate/ArrayAgg.java

  Log Message:
  -----------
  TEIID-4403 at least using a proper exception
# Conflicts:
#	engine/src/main/java/org/teiid/query/QueryPlugin.java
#	engine/src/main/resources/org/teiid/query/i18n.properties


  Commit: ebe2672cb3ca712a83a062e82ae471c2cd6c8234
      https://github.com/teiid/teiid/commit/ebe2672cb3ca712a83a062e82ae471c2cd6c8234
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/TeiidServiceHandler.java
    M olingo/src/main/resources/org/teiid/olingo/i18n.properties
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-4390 adding level support


  Commit: 57d619252880add29096bc16c37920c3ef8d4ac9
      https://github.com/teiid/teiid/commit/57d619252880add29096bc16c37920c3ef8d4ac9
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/ExpandDocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java

  Log Message:
  -----------
  TEIID-4397 allowing $it to be used in expand


  Commit: b44c5673d5a1d45b3485418457ed34823950cc96
      https://github.com/teiid/teiid/commit/b44c5673d5a1d45b3485418457ed34823950cc96
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/TeiidODataJsonSerializer.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M pom.xml

  Log Message:
  -----------
  TEIID-4430, TEIID-4399 : Upgrading the Olingo library to latest 4.3 and
allowing the  construct in Teiid to > 1 (#799)


# Conflicts:
#	pom.xml


  Commit: 8457723665a7d1db04d7e40f40544939e5e8e0b4
      https://github.com/teiid/teiid/commit/8457723665a7d1db04d7e40f40544939e5e8e0b4
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java

  Log Message:
  -----------
  TEIID-4100 using the expand options in cyclic expansion


  Commit: 52fc15e247422c2fec52bcc262246c7961124637
      https://github.com/teiid/teiid/commit/52fc15e247422c2fec52bcc262246c7961124637
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/common/buffer/impl/SizeUtility.java
    M engine/src/main/java/org/teiid/query/function/aggregate/ArrayAgg.java
    M engine/src/test/java/org/teiid/common/buffer/impl/TestSizeUtility.java
    M engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java
    M engine/src/test/java/org/teiid/query/processor/TestTextTable.java

  Log Message:
  -----------
  TEIID-4403 allowing for larger arrays
# Conflicts:
#	engine/src/main/java/org/teiid/query/QueryPlugin.java
#	engine/src/main/resources/org/teiid/query/i18n.properties


  Commit: 10cf7fb69a54faec7aa61c9d5827817f3d90628c
      https://github.com/teiid/teiid/commit/10cf7fb69a54faec7aa61c9d5827817f3d90628c
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
    M api/src/main/java/org/teiid/translator/ExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java
    M engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
    M engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
    M engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java

  Log Message:
  -----------
  TEIID-4633 fixing invalid generation of array queries
# Conflicts:
#	api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
#	api/src/test/java/org/teiid/translator/TestBaseDelegatingExecutionFactory.java
#	connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java
#	engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java


  Commit: c4bf30851de52b10e9c866175cbf16c4b0375af3
      https://github.com/teiid/teiid/commit/c4bf30851de52b10e9c866175cbf16c4b0375af3
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
    M engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java

  Log Message:
  -----------
  TEIID-4892 fix for scalar subquery with hint toString issue


  Commit: 440f30764c923fb1bf66b96ab34b205302d1f1ab
      https://github.com/teiid/teiid/commit/440f30764c923fb1bf66b96ab34b205302d1f1ab
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java

  Log Message:
  -----------
  TEIID-4459 initial support for converting select scalar subqueries
# Conflicts:
#	engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java


  Commit: ca8b2b3fc796c1a3bc42d727d714603a3ccbe135
      https://github.com/teiid/teiid/commit/ca8b2b3fc796c1a3bc42d727d714603a3ccbe135
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java

  Log Message:
  -----------
  TEIID-4451 fixing aggregate handling
# Conflicts:
#	engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java


  Commit: 5db072258a5c388d8dc89d241ca474079c251372
      https://github.com/teiid/teiid/commit/5db072258a5c388d8dc89d241ca474079c251372
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-15 (Sat, 15 Jul 2017)

  Changed paths:
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-4298 fixing unit test for 6.4


  Commit: b7d0ab948cae223185024595ed7a5b8367453398
      https://github.com/teiid/teiid/commit/b7d0ab948cae223185024595ed7a5b8367453398
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-17 (Mon, 17 Jul 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/processor/relational/SubqueryAwareEvaluator.java
    M engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java

  Log Message:
  -----------
  TEIID-4335: No buffer when close called (fixing the npe)


  Commit: cd426bf7705644eb3485c7cb88059e4183120ee3
      https://github.com/teiid/teiid/commit/cd426bf7705644eb3485c7cb88059e4183120ee3
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/processor/relational/SubqueryAwareEvaluator.java
    M engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java

  Log Message:
  -----------
  Merge pull request #987 from shawkins/64-8.12.x

TEIID-4335: No buffer when close called (fixing the npe)


  Commit: 7e49f8292e32028937c5a4c43f982e09e320688b
      https://github.com/teiid/teiid/commit/7e49f8292e32028937c5a4c43f982e09e320688b
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M api/src/main/java/org/teiid/translator/BaseDelegatingExecutionFactory.java
    M api/src/main/java/org/teiid/translator/ExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java
    M engine/src/main/java/org/teiid/common/buffer/impl/SizeUtility.java
    M engine/src/main/java/org/teiid/dqp/internal/datamgr/CapabilitiesConverter.java
    M engine/src/main/java/org/teiid/query/function/aggregate/ArrayAgg.java
    M engine/src/main/java/org/teiid/query/optimizer/capabilities/SourceCapabilities.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/RelationalPlanner.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleMergeCriteria.java
    M engine/src/main/java/org/teiid/query/processor/relational/RelationalNode.java
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
    M engine/src/test/java/org/teiid/common/buffer/impl/TestSizeUtility.java
    M engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java
    M engine/src/test/java/org/teiid/query/processor/TestArrayProcessing.java
    M engine/src/test/java/org/teiid/query/processor/TestTextTable.java
    M engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java
    M jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
    M olingo-common/src/main/java/org/teiid/olingo/common/ODataTypeManager.java
    M olingo/src/main/java/org/teiid/odata/api/Client.java
    M olingo/src/main/java/org/teiid/odata/api/QueryResponse.java
    M olingo/src/main/java/org/teiid/olingo/ODataPlugin.java
    M olingo/src/main/java/org/teiid/olingo/ProjectedColumn.java
    M olingo/src/main/java/org/teiid/olingo/TeiidODataJsonSerializer.java
    M olingo/src/main/java/org/teiid/olingo/service/ComplexDocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/CrossJoinResult.java
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
    M olingo/src/main/java/org/teiid/olingo/service/ExpandDocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/ExpandSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/LocalClient.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/OperationResponseImpl.java
    M olingo/src/main/java/org/teiid/olingo/service/TeiidServiceHandler.java
    M olingo/src/main/resources/org/teiid/olingo/i18n.properties
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java
    M pom.xml

  Log Message:
  -----------
  Merge branch 'odata-64' of https://github.com/shawkins/teiid into
64-8.12.x

# Conflicts:
#	engine/src/test/java/org/teiid/query/optimizer/TestSubqueryPushdown.java


  Commit: feb73ec486c3a1162e57dbb102dc67d527f11f3f
      https://github.com/teiid/teiid/commit/feb73ec486c3a1162e57dbb102dc67d527f11f3f
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    A connectors/salesforce/translator-salesforce/src/test/java/org/teiid/translator/salesforce/execution/visitors/TestVisitors.java
    A connectors/salesforce/translator-salesforce/src/test/resources/sf.ddl
    M connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/visitors/JoinQueryVisitor.java

  Log Message:
  -----------
  TEIID-4947: fixing the handling of custom relationships


  Commit: 8ce1003dc5f3664c82083a8746414bc4c071f3d5
      https://github.com/teiid/teiid/commit/8ce1003dc5f3664c82083a8746414bc4c071f3d5
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M pom.xml
    M settings.xml
    M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestSOAPWebService.java
    A test-integration/common/src/test/resources/arquillian/credentials/mgmt-groups.properties
    A test-integration/common/src/test/resources/arquillian/credentials/mgmt-users.properties

  Log Message:
  -----------
  Upgrade zookeeper and libthrift and fixed an arquillian test


  Commit: acb55635ea267191c3fdb2679a9c16474cdb7db7
      https://github.com/teiid/teiid/commit/acb55635ea267191c3fdb2679a9c16474cdb7db7
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-07-26 (Wed, 26 Jul 2017)

  Changed paths:
    M pom.xml
    M settings.xml
    M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestSOAPWebService.java
    A test-integration/common/src/test/resources/arquillian/credentials/mgmt-groups.properties
    A test-integration/common/src/test/resources/arquillian/credentials/mgmt-users.properties

  Log Message:
  -----------
  Merge branch 'version-upgrades' of https://github.com/vhalbert/teiid into 64-8.12.x


  Commit: a30bc1d01d2fd1875fdfaad674449127d8537e06
      https://github.com/teiid/teiid/commit/a30bc1d01d2fd1875fdfaad674449127d8537e06
  Author: vhalbert <vhalbert at jboss.org>
  Date:   2017-07-27 (Thu, 27 Jul 2017)

  Changed paths:
    M pom.xml
    M teiid-jdbc/dependency-reduced-pom.xml
    A teiid-jdbc/licenses/licenses.css
    A teiid-jdbc/licenses/licenses.html
    A teiid-jdbc/licenses/licenses.xml
    M teiid-jdbc/pom.xml

  Log Message:
  -----------
  TEIID-5009 adding the licenses to the packaging of the teiid-jdbc driver


  Commit: 31463668fb520fb24df02aad4e276094e129cac9
      https://github.com/teiid/teiid/commit/31463668fb520fb24df02aad4e276094e129cac9
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-07-28 (Fri, 28 Jul 2017)

  Changed paths:
    M pom.xml
    M teiid-jdbc/dependency-reduced-pom.xml
    A teiid-jdbc/licenses/licenses.css
    A teiid-jdbc/licenses/licenses.html
    A teiid-jdbc/licenses/licenses.xml
    M teiid-jdbc/pom.xml

  Log Message:
  -----------
  Merge pull request #994 from vhalbert/teiid-jdbc-licenses

TEIID-5009 adding the licenses to the packaging of the teiid-jdbc driver


  Commit: 97e90ff3ce5ec06850053f38cea7a84a1942d1cd
      https://github.com/teiid/teiid/commit/97e90ff3ce5ec06850053f38cea7a84a1942d1cd
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java
    M connectors/translator-google/src/test/java/org/teiid/translator/google/TestSQLtoSpreadsheetQuery.java

  Log Message:
  -----------
  TEIID-4700 adding null handling
# Conflicts:
#	connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java


  Commit: 849483c82f0b129e02237e66da7e87798492eec0
      https://github.com/teiid/teiid/commit/849483c82f0b129e02237e66da7e87798492eec0
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java
    M connectors/translator-google/src/main/resources/org/teiid/translator/google/i18n.properties

  Log Message:
  -----------
  TEIID-4844 preventing the use of time/timestamp literals
# Conflicts:
#	connectors/google/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java

# Conflicts:
#	connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java


  Commit: 030f840d39182083642e16459ba3d153938014e4
      https://github.com/teiid/teiid/commit/030f840d39182083642e16459ba3d153938014e4
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/common/buffer/FileStore.java
    M engine/src/main/java/org/teiid/common/buffer/StorageManager.java
    M engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java
    M engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
    M engine/src/main/java/org/teiid/common/buffer/impl/EncryptedStorageManager.java
    M engine/src/main/java/org/teiid/common/buffer/impl/FileStorageManager.java
    M engine/src/main/java/org/teiid/common/buffer/impl/MemoryStorageManager.java
    M engine/src/main/java/org/teiid/common/buffer/impl/SplittableStorageManager.java
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java
    M engine/src/test/java/org/teiid/common/buffer/impl/TestBufferManagerImpl.java
    M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java

  Log Message:
  -----------
  TEIID-2465 adding filestore and tuplebuffer/table size limitations
# Conflicts:
#	engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
#	engine/src/main/java/org/teiid/query/QueryPlugin.java
#	engine/src/main/resources/org/teiid/query/i18n.properties


  Commit: 068e06b6afd498d0b6f520ac52fcc6423a3e5631
      https://github.com/teiid/teiid/commit/068e06b6afd498d0b6f520ac52fcc6423a3e5631
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M admin/src/main/java/org/teiid/adminapi/impl/SessionMetadata.java
    M engine/src/main/java/org/teiid/common/buffer/Cache.java
    M engine/src/main/java/org/teiid/common/buffer/impl/BufferFrontedFileStoreCache.java
    M engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
    M engine/src/main/java/org/teiid/common/buffer/impl/MemoryStorageManager.java
    M engine/src/main/java/org/teiid/common/buffer/impl/PhysicalInfo.java
    M engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
    M engine/src/main/java/org/teiid/query/QueryPlugin.java
    M engine/src/main/java/org/teiid/query/util/Options.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/common/buffer/TestSTree.java
    M engine/src/test/java/org/teiid/common/buffer/impl/TestBufferFrontedFileStoreCache.java
    M engine/src/test/java/org/teiid/common/buffer/impl/TestBufferManagerImpl.java
    M jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html
    M test-integration/perf/src/test/java/org/teiid/query/eval/TestJDBCSocketPerformance.java

  Log Message:
  -----------
  TEIID-4557 TEIID-2465 refining size limitation and adding a session
limit
# Conflicts:
#	engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
#	engine/src/main/java/org/teiid/query/util/Options.java
#	engine/src/main/resources/org/teiid/query/i18n.properties
#	jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html


  Commit: fe67ee9aa546141ea5daabc256528e42f7728400
      https://github.com/teiid/teiid/commit/fe67ee9aa546141ea5daabc256528e42f7728400
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-09 (Wed, 09 Aug 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java

  Log Message:
  -----------
  TEIID-4557 TEIID-2465 refining size limitation and adding a session
limit
# Conflicts:
#	engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
#	engine/src/main/java/org/teiid/query/util/Options.java
#	engine/src/main/resources/org/teiid/query/i18n.properties
#	jboss-integration/kits/wildfly/docs/teiid/teiid-releasenotes.html


  Commit: 27e07555aabbf83c190b78a82c5dc6b9324640e5
      https://github.com/teiid/teiid/commit/27e07555aabbf83c190b78a82c5dc6b9324640e5
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2017-08-15 (Tue, 15 Aug 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-ha-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/amazon-s3/amazon-s3-vdb.xml
    A build/kits/jboss-as7/overlay/docs/teiid/datasources/amazon-s3/amazon-s3.xml
    M build/kits/jboss-as7/overlay/standalone/configuration/standalone-teiid.xml
    M connectors/pom.xml
    A connectors/translator-amazon-s3/kits/embedded-dist.xml
    A connectors/translator-amazon-s3/kits/jboss-as7-dist.xml
    A connectors/translator-amazon-s3/kits/jboss-as7/modules/org/jboss/teiid/translator/amazon/s3/main/module.xml
    A connectors/translator-amazon-s3/pom.xml
    A connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/AWS4SignerBase.java
    A connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/AWS4SignerForAuthorizationHeader.java
    A connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/AWS4SignerForChunkedUpload.java
    A connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/BinaryUtils.java
    A connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ExecutionFactory.java
    A connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ProcedureExecution.java
    A connectors/translator-amazon-s3/src/main/resources/META-INF/services/org.teiid.translator.ExecutionFactory
    A connectors/translator-amazon-s3/src/main/resources/org/teiid/translator/amazon/s3/i18n.properties

  Log Message:
  -----------
  TEIID-4981: Adding support for Amazon S3 translator (#999)


  Commit: 4b79fa74af6b660dbd0c5a886604a6ee230b4565
      https://github.com/teiid/teiid/commit/4b79fa74af6b660dbd0c5a886604a6ee230b4565
  Author: Van Halbert <vhalbert at localhost.localdomain>
  Date:   2017-08-21 (Mon, 21 Aug 2017)

  Changed paths:
    M connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ProcedureExecution.java

  Log Message:
  -----------
  TEIID-5023 changed from using java 1.8 feature to using teiid base64


  Commit: 75db564a512ae6bcff04a50479fe8303f17f4183
      https://github.com/teiid/teiid/commit/75db564a512ae6bcff04a50479fe8303f17f4183
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-08-21 (Mon, 21 Aug 2017)

  Changed paths:
    M connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ProcedureExecution.java

  Log Message:
  -----------
  Merge pull request #1000 from vhalbert/64-teiid-5023

TEIID-5023 changed from using java 1.8 feature to using teiid base64


  Commit: f18b3ae8298b6bf3a4dfea9115dfe473736d3735
      https://github.com/teiid/teiid/commit/f18b3ae8298b6bf3a4dfea9115dfe473736d3735
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    A engine/src/main/java/org/teiid/query/sql/lang/ImmutableCompareCriteria.java
    M engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java

  Log Message:
  -----------
  TEIID-5045 fixing modification of true criteria


  Commit: e384d20cd4031fb9d7424ac7b885f43e1e0006a1
      https://github.com/teiid/teiid/commit/e384d20cd4031fb9d7424ac7b885f43e1e0006a1
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/SubstringFunctionModifier.java
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbase.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestVisitor.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties

  Log Message:
  -----------
  TEIID-4974 TEIID-5030 TEIID-5031 TEIID-5033 TEIID-5034 TEIID-5035
TEIID-5036 TEIID-5037 addressing various couchbase issues
# Conflicts:
#	connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/postgresql/PostgreSQLExecutionFactory.java
#	connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/postgresql/TestPostgreSQLTranslator.java
#	engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
#	engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java


  Commit: 8924e6b47e540ea32535ea1107ca1a2d69f5ba1e
      https://github.com/teiid/teiid/commit/8924e6b47e540ea32535ea1107ca1a2d69f5ba1e
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java

  Log Message:
  -----------
  TEIID-5037 using the super logic


  Commit: 65bb1ade19617a689af4e5267c38d88eba019400
      https://github.com/teiid/teiid/commit/65bb1ade19617a689af4e5267c38d88eba019400
  Author: Kylin Soong <kylinsoong.1214 at gmail.com>
  Date:   2017-09-01 (Fri, 01 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbaseMetadataProcessor.java
    A connectors/translator-couchbase/src/test/resources/moreTypedNameInOneKeyspace.expected

  Log Message:
  -----------
  TEIID-4933: add sampleKeyspaces property, support more typed name in one
keyspace (#962)


# Conflicts:
#	connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java


  Commit: 627d265fccf9421fa379f3e98becffa6495bc6c7
      https://github.com/teiid/teiid/commit/627d265fccf9421fa379f3e98becffa6495bc6c7
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-03 (Sun, 03 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    M connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbase.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties

  Log Message:
  -----------
  TEIID-5042 TEIID-5039 allowing for better datatype handling and updates
with named types
# Conflicts:
#	connectors/couchbase/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
#	connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java


  Commit: 054cb0d7d1ba7116cf6e950e92a2e683dbbf9c3f
      https://github.com/teiid/teiid/commit/054cb0d7d1ba7116cf6e950e92a2e683dbbf9c3f
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    A connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/SubstringFunctionModifier.java
    M connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    A connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbase.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestVisitor.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties
    A connectors/translator-couchbase/src/test/resources/moreTypedNameInOneKeyspace.expected
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    A engine/src/main/java/org/teiid/query/sql/lang/ImmutableCompareCriteria.java
    M engine/src/test/java/org/teiid/query/rewriter/TestQueryRewriter.java

  Log Message:
  -----------
  Merge pull request #1001 from shawkins/64-8.12.x

Commits for 64 8.12.x


  Commit: 84b9d55909b511a82d9d7b3779b9ec7783ecc785
      https://github.com/teiid/teiid/commit/84b9d55909b511a82d9d7b3779b9ec7783ecc785
  Author: Van Halbert <vhalbert at redhat.com>
  Date:   2017-09-05 (Tue, 05 Sep 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-ha-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli

  Log Message:
  -----------
  removing configuration of infinispan translator and resource-adapter, will need to run CLI script to integrate JDG


  Commit: 54c9451622eb03f59976d2f2a97965a5ca34b31e
      https://github.com/teiid/teiid/commit/54c9451622eb03f59976d2f2a97965a5ca34b31e
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M client/src/main/java/org/teiid/net/socket/SocketServerInstanceImpl.java
    M runtime/src/test/java/org/teiid/transport/TestCommSockets.java
    M runtime/src/test/java/org/teiid/transport/TestSocketRemoting.java

  Log Message:
  -----------
  TEIID-5054 fixing failing ping


  Commit: 26265824615da86341b6bdf181f7c588ad0a1dc3
      https://github.com/teiid/teiid/commit/26265824615da86341b6bdf181f7c588ad0a1dc3
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-06 (Wed, 06 Sep 2017)

  Changed paths:
    M client/src/main/java/org/teiid/net/socket/SocketServerConnection.java
    M runtime/src/test/java/org/teiid/transport/TestCommSockets.java

  Log Message:
  -----------
  TEIID-5054 fixing failing ping test


  Commit: bdf29976909c57aa29b0f4cad692358558e7353e
      https://github.com/teiid/teiid/commit/bdf29976909c57aa29b0f4cad692358558e7353e
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-07 (Thu, 07 Sep 2017)

  Changed paths:
    M runtime/src/test/java/org/teiid/transport/TestCommSockets.java

  Log Message:
  -----------
  TEIID-5054 making compatible with older jdks


  Commit: bc75e1e6b04f46c444e16ac2daeb00b4d00c28a9
      https://github.com/teiid/teiid/commit/bc75e1e6b04f46c444e16ac2daeb00b4d00c28a9
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-11 (Mon, 11 Sep 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/common/buffer/TupleBrowser.java
    M engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java
    M engine/src/main/java/org/teiid/common/buffer/impl/LrfuEvictionQueue.java
    M engine/src/main/java/org/teiid/query/tempdata/TempTable.java
    M engine/src/test/java/org/teiid/common/buffer/TestSTree.java
    M engine/src/test/java/org/teiid/common/buffer/impl/TestLrfuEvictionQueue.java
    M engine/src/test/java/org/teiid/query/processor/TestTempTables.java
    M test-integration/common/src/test/java/org/teiid/jdbc/FakeServer.java
    M test-integration/perf/src/test/java/org/teiid/query/eval/TestEnginePerformance.java

  Log Message:
  -----------
  TEIID-5059 fixing touch and adding more assertions
# Conflicts:
#	engine/src/main/java/org/teiid/common/buffer/impl/BufferManagerImpl.java

# Conflicts:
#	engine/src/main/java/org/teiid/query/tempdata/TempTable.java


  Commit: 022ff099950dd8d4ebcd7fdd0132d301ddb9da55
      https://github.com/teiid/teiid/commit/022ff099950dd8d4ebcd7fdd0132d301ddb9da55
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-13 (Wed, 13 Sep 2017)

  Changed paths:
    M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataFilterVisitor.java
    M connectors/translator-odata4/src/main/java/org/teiid/translator/odata4/ODataProcedureExecution.java
    M connectors/translator-odata4/src/test/java/org/teiid/translator/odata4/TestODataSQLVistor.java
    M connectors/translator-odata4/src/test/resources/trippin.xml
    M olingo-common/src/main/java/org/teiid/olingo/common/ODataTypeManager.java
    M olingo/src/main/java/org/teiid/olingo/service/EntityCollectionResponse.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java

  Log Message:
  -----------
  TEIID-5063 addressing bigdecimal issues
# Conflicts:
#	olingo-common/src/main/java/org/teiid/olingo/common/ODataTypeManager.java


  Commit: f8720f0fcaa2c6a1b3b6ecab56e9588f6bc6fd81
      https://github.com/teiid/teiid/commit/f8720f0fcaa2c6a1b3b6ecab56e9588f6bc6fd81
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleDecomposeJoin.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java
    M engine/src/test/java/org/teiid/query/processor/TestDependentJoins.java

  Log Message:
  -----------
  TEIID-5020: Join query results in NullPointerException (fixing predicate issue over nested union)


  Commit: c4d207044e27430b71b3eff9d60d66ccc0843bb5
      https://github.com/teiid/teiid/commit/c4d207044e27430b71b3eff9d60d66ccc0843bb5
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-14 (Thu, 14 Sep 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/dqp/internal/process/DQPWorkContext.java
    M engine/src/main/java/org/teiid/dqp/internal/process/Request.java
    M engine/src/main/java/org/teiid/dqp/service/TransactionContext.java
    M runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
    M runtime/src/main/java/org/teiid/transport/LocalServerConnection.java
    M test-integration/common/src/test/java/org/teiid/jdbc/TestInternalConnection.java

  Log Message:
  -----------
  TEIID-4960: Problems when using External Materialized Views (fixing an issue with nesting request transactions)


  Commit: b651862c8d4a4a79547470652f67b0e253cebaa2
      https://github.com/teiid/teiid/commit/b651862c8d4a4a79547470652f67b0e253cebaa2
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-15 (Fri, 15 Sep 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/rewriter/QueryRewriter.java
    M engine/src/main/resources/org/teiid/query/i18n.properties
    M engine/src/test/java/org/teiid/query/processor/TestInherintlyUpdatableViews.java

  Log Message:
  -----------
  TEIID-5067 correcting the handling of update/delete with non-mappable
columns


  Commit: 38af0d398f95b01052d722733ccd74fbca650e11
      https://github.com/teiid/teiid/commit/38af0d398f95b01052d722733ccd74fbca650e11
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbase.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLVisitor.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties

  Log Message:
  -----------
  TEIID-5068 adjusting how biginteger/decimal values are read


  Commit: 0653e4b023f8863d5f86b4c993f8c13fd35ab1e1
      https://github.com/teiid/teiid/commit/0653e4b023f8863d5f86b4c993f8c13fd35ab1e1
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-18 (Mon, 18 Sep 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java
    M engine/src/main/java/org/teiid/query/processor/relational/EnhancedSortMergeJoinStrategy.java
    M engine/src/main/java/org/teiid/query/processor/relational/JoinNode.java
    M engine/src/main/java/org/teiid/query/processor/relational/SortUtility.java
    M engine/src/main/java/org/teiid/query/processor/relational/SourceState.java
    M engine/src/test/java/org/teiid/query/processor/TestSourceHints.java
    M engine/src/test/java/org/teiid/query/processor/TestTempTables.java
    M engine/src/test/java/org/teiid/query/processor/TestWithClauseProcessing.java
    M engine/src/test/java/org/teiid/query/processor/relational/TestJoinNode.java

  Log Message:
  -----------
  TEIID-4812: Processor is not exiting the join as soon as it's determined one side contains 0 rows (addressing issues related to no rows and larger reads from)
temp tables


  Commit: 8458f5ff74eb3c76776a1f2a73e91215762d67da
      https://github.com/teiid/teiid/commit/8458f5ff74eb3c76776a1f2a73e91215762d67da
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-19 (Tue, 19 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseQueryExecution.java
    M connectors/translator-couchbase/src/test/resources/N1QL.properties

  Log Message:
  -----------
  TEIID-5068 updating the retrieval logic


  Commit: 8dfa2831ac3da0f95f2657fbb0c9265fdb24b575
      https://github.com/teiid/teiid/commit/8dfa2831ac3da0f95f2657fbb0c9265fdb24b575
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java

  Log Message:
  -----------
  TEIID-5039 addressing the bulk case
# Conflicts:
#	connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java


  Commit: f7fd60e528d51b049ed3c393ad270575c74e03b3
      https://github.com/teiid/teiid/commit/f7fd60e528d51b049ed3c393ad270575c74e03b3
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2017-09-21 (Thu, 21 Sep 2017)

  Changed paths:
    M connectors/translator-odata4/pom.xml
    M olingo/src/main/java/org/teiid/olingo/TeiidODataJsonSerializer.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M pom.xml

  Log Message:
  -----------
  Teiid 5064 (#1014)

* TEIID-5064: updating the Olingo version to 4.4.0 (#1013)

* TEIID-5064: adding dependencies to run the test cases correctly without CNF exceptions


  Commit: 6fa91259cdb15ff04796cd017be7961aaba05d0b
      https://github.com/teiid/teiid/commit/6fa91259cdb15ff04796cd017be7961aaba05d0b
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-22 (Fri, 22 Sep 2017)

  Changed paths:
    M client/src/main/java/org/teiid/jdbc/PreparedStatementImpl.java
    M client/src/main/java/org/teiid/netty/handler/codec/serialization/ObjectDecoderInputStream.java
    M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
    M engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
    M runtime/src/test/java/org/teiid/runtime/TestEmbeddedServer.java

  Log Message:
  -----------
  TEIID-5069 addressing embedded handling of streams and several cleanups


  Commit: 85ced82028704918e8933c232bb7faff81cd4fd1
      https://github.com/teiid/teiid/commit/85ced82028704918e8933c232bb7faff81cd4fd1
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    M engine/src/main/java/org/teiid/dqp/internal/process/PreparedStatementRequest.java
    M engine/src/main/java/org/teiid/query/eval/Evaluator.java
    M engine/src/main/java/org/teiid/query/optimizer/TriggerActionPlanner.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/CriteriaCapabilityValidatorVisitor.java
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleRaiseAccess.java
    M engine/src/test/java/org/teiid/dqp/internal/process/TestPreparedStatementBatchedUpdate.java
    M engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java

  Log Message:
  -----------
  TEIID-5041 addressing couchbase and batched update planning in general
# Conflicts:
#	connectors/couchbase/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
#	connectors/couchbase/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
#	connectors/couchbase/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
#	engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java


  Commit: 1aa17ef38f78783b93c72fd9af5e26b52f3cfef4
      https://github.com/teiid/teiid/commit/1aa17ef38f78783b93c72fd9af5e26b52f3cfef4
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-domain-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-ha-mode-install.cli
    M build/kits/jboss-as7/overlay/bin/scripts/teiid-standalone-mode-install.cli

  Log Message:
  -----------
  Merge pull request #1002 from vhalbert/teiid-5032

TEIID-5032 - removing configuration of infinispan translator and resource-adapter


  Commit: 827eb3813374509466cdbfcdda9b94f9fe91289e
      https://github.com/teiid/teiid/commit/827eb3813374509466cdbfcdda9b94f9fe91289e
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java
    M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java

  Log Message:
  -----------
  BZ1417982 + TEIID-4875(reprise): addressing another issue with multiple decompositions


  Commit: 8637ee0c2115459b5db9cb52e272a079a35b7c8a
      https://github.com/teiid/teiid/commit/8637ee0c2115459b5db9cb52e272a079a35b7c8a
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseUpdateExecution.java

  Log Message:
  -----------
  TEIID-5075 correcting update count logic


  Commit: 16de7c6bd445ae201fcdf321f90fc909852cc3be
      https://github.com/teiid/teiid/commit/16de7c6bd445ae201fcdf321f90fc909852cc3be
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-09-25 (Mon, 25 Sep 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushAggregates.java
    M engine/src/test/java/org/teiid/query/processor/TestAggregateProcessing.java

  Log Message:
  -----------
  Merge pull request #1019 from vhalbert/teiid-4875-64

BZ1451870 + TEIID-4875 backport


  Commit: 32cd1ea0b9f3788c418bee5f9a75c86ebe516c25
      https://github.com/teiid/teiid/commit/32cd1ea0b9f3788c418bee5f9a75c86ebe516c25
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-27 (Wed, 27 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbasePlugin.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLUpdateVisitor.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/N1QLVisitor.java
    M connectors/translator-couchbase/src/main/resources/org/teiid/translator/couchbase/i18n.properties
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestN1QLUpdateVisitor.java

  Log Message:
  -----------
  TEIID-5076 adding a better exception


  Commit: a895e8ae52c97001c938c08fcf9856130e4b0900
      https://github.com/teiid/teiid/commit/a895e8ae52c97001c938c08fcf9856130e4b0900
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseMetadataProcessor.java
    M connectors/translator-couchbase/src/test/java/org/teiid/translator/couchbase/TestCouchbase.java

  Log Message:
  -----------
  TEIID-5077 adding a property to use double instead of more precise types


  Commit: ad0ee8715dc210ff25bad5306f7997ed6cc65f79
      https://github.com/teiid/teiid/commit/ad0ee8715dc210ff25bad5306f7997ed6cc65f79
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java
    M connectors/translator-file/src/test/java/org/teiid/translator/file/TestFileExecutionFactory.java

  Log Message:
  -----------
  TEIID-4857 adding file metadata to the resultset
# Conflicts:
#	connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java


  Commit: f81d69e1bd7025f2096bf648b4b76432c4af50a1
      https://github.com/teiid/teiid/commit/f81d69e1bd7025f2096bf648b4b76432c4af50a1
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-09-29 (Fri, 29 Sep 2017)

  Changed paths:
    M connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java
    M connectors/translator-file/src/test/java/org/teiid/translator/file/TestFileExecutionFactory.java

  Log Message:
  -----------
  TEIID-4857 adding a backwards compatibility check
# Conflicts:
#	connectors/translator-file/src/main/java/org/teiid/translator/file/FileExecutionFactory.java
#	connectors/translator-file/src/test/java/org/teiid/translator/file/TestFileExecutionFactory.java


  Commit: 243b52260b1da3b39924987fc0b1eaa8f4e7d69f
      https://github.com/teiid/teiid/commit/243b52260b1da3b39924987fc0b1eaa8f4e7d69f
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M connectors/connector-couchbase/kits/jboss-as7/modules/org/jboss/teiid/resource-adapter/couchbase/main/META-INF/ra.xml
    M connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseConnectionImpl.java
    M connectors/connector-couchbase/src/main/java/org/teiid/resource/adapter/couchbase/CouchbaseManagedConnectionFactory.java
    M connectors/connector-couchbase/src/main/rar/META-INF/ra.xml
    M connectors/translator-couchbase/src/main/java/org/teiid/translator/couchbase/CouchbaseExecutionFactory.java

  Log Message:
  -----------
  TEIID-5086 adding a scan consistency parameter to the resource adapter


  Commit: d606f2e851f153acb9597c95d1b39bd9b50c9333
      https://github.com/teiid/teiid/commit/d606f2e851f153acb9597c95d1b39bd9b50c9333
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-05 (Thu, 05 Oct 2017)

  Changed paths:
    A test-integration/common/src/test/java/org/teiid/systemmodel/TestExternalMatViews.java

  Log Message:
  -----------
  TEIID-4641 backporting some of the tests


  Commit: eebfd234e0b87bb59a17329eb31314d2dc1f4247
      https://github.com/teiid/teiid/commit/eebfd234e0b87bb59a17329eb31314d2dc1f4247
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java

  Log Message:
  -----------
  TEIID-5014 fix for node.js prepared statements


  Commit: a6a96a947d0fe89a0a2d97b2384205f897c22ebc
      https://github.com/teiid/teiid/commit/a6a96a947d0fe89a0a2d97b2384205f897c22ebc
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-09 (Mon, 09 Oct 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/eval/Evaluator.java
    M engine/src/test/java/org/teiid/query/processor/TestTriggerActions.java

  Log Message:
  -----------
  TEIID-5094 fixing null comparison


  Commit: 64d23d87883dfad1da188df4b43f030b75c40c99
      https://github.com/teiid/teiid/commit/64d23d87883dfad1da188df4b43f030b75c40c99
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java

  Log Message:
  -----------
  Merge pull request #1023 from vhalbert/teiid-5014

TEIID-5014 fix for node.js prepared statements


  Commit: d197ff8025ff8c3cb74c72695fe06ca0380686d2
      https://github.com/teiid/teiid/commit/d197ff8025ff8c3cb74c72695fe06ca0380686d2
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-10-10 (Tue, 10 Oct 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java

  Log Message:
  -----------
  Revert "TEIID-5014 fix for node.js prepared statements"

This reverts commit eebfd234e0b87bb59a17329eb31314d2dc1f4247.


  Commit: 542e61b48d01dd94e6b13d612702cc18ff3c6142
      https://github.com/teiid/teiid/commit/542e61b48d01dd94e6b13d612702cc18ff3c6142
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java

  Log Message:
  -----------
  TEIID-5014 fix for node.js prepared statements


  Commit: e1679a173ef92b10ebc9b9c53058e57b78f8c23d
      https://github.com/teiid/teiid/commit/e1679a173ef92b10ebc9b9c53058e57b78f8c23d
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ProcedureExecution.java

  Log Message:
  -----------
  TEIID-5092 fixing unsynchronized static access to simpledateformat


  Commit: c82a2097627e190e2671da0f787d383304b576a3
      https://github.com/teiid/teiid/commit/c82a2097627e190e2671da0f787d383304b576a3
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-11 (Wed, 11 Oct 2017)

  Changed paths:
    M connectors/translator-salesforce/src/main/java/org/teiid/translator/salesforce/execution/InsertExecutionImpl.java

  Log Message:
  -----------
  TEIID-5098 fixing unsynchronized static dateformat


  Commit: 88721300a3fcd285f0bf6dffbf4c7d23e1f4f141
      https://github.com/teiid/teiid/commit/88721300a3fcd285f0bf6dffbf4c7d23e1f4f141
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-12 (Thu, 12 Oct 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
    M engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
    M test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected

  Log Message:
  -----------
  TEIID-4835 adding column level dependencies


  Commit: 1367c68f4bfaa2b50d72717d391a3a1bd92b3bf0
      https://github.com/teiid/teiid/commit/1367c68f4bfaa2b50d72717d391a3a1bd92b3bf0
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-10-18 (Wed, 18 Oct 2017)

  Changed paths:
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestExternalMatViews.java

  Log Message:
  -----------
  need to remove logger in tests (#1028)


  Commit: e6bc9dd3762185d4925457a0f1344f3a03bd8b4e
      https://github.com/teiid/teiid/commit/e6bc9dd3762185d4925457a0f1344f3a03bd8b4e
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-10-23 (Mon, 23 Oct 2017)

  Changed paths:
    M api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java
    M engine/src/main/java/org/teiid/query/sql/visitor/SQLStringVisitor.java
    M engine/src/test/java/org/teiid/query/processor/TestSetProcessing.java
    M engine/src/test/java/org/teiid/query/sql/visitor/TestSQLStringVisitor.java

  Log Message:
  -----------
  TEIID-5109 adding parens when needed with intersect (#1029)


  Commit: 0cb284c8b38f7820536cdf16c933e1a262a886b5
      https://github.com/teiid/teiid/commit/0cb284c8b38f7820536cdf16c933e1a262a886b5
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PIExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PISQLConversionVisitor.java
    M connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/pi/TestPIExecutionFactory.java

  Log Message:
  -----------
  TEIID-5116, TEIID-5117, TEIID-5118, TEIID-5120 : PI Transalator issues (#1030)


  Commit: 32a2242ce5f5083616a8934d37ffe66751c27a01
      https://github.com/teiid/teiid/commit/32a2242ce5f5083616a8934d37ffe66751c27a01
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/common/buffer/LobManager.java
    M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
    M engine/src/main/java/org/teiid/dqp/internal/process/TupleSourceCache.java
    M engine/src/main/java/org/teiid/dqp/message/AtomicRequestMessage.java
    M engine/src/main/java/org/teiid/query/processor/RegisterRequestParameter.java
    M engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java

  Log Message:
  -----------
  TEIID-5121 addressing streaming lobs with a shared tuple source
# Conflicts:
#	engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java


  Commit: c1e1682a30dfc8d94ce03ee87cb1b9c1c831728d
      https://github.com/teiid/teiid/commit/c1e1682a30dfc8d94ce03ee87cb1b9c1c831728d
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-25 (Wed, 25 Oct 2017)

  Changed paths:
    M connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ExecutionFactory.java
    M connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ProcedureExecution.java
    M engine/src/main/java/org/teiid/dqp/internal/datamgr/ConnectorWorkItem.java
    M engine/src/test/java/org/teiid/dqp/internal/datamgr/TestConnectorWorkItem.java

  Log Message:
  -----------
  TEIID-5093 adding explicit streaming to s3
# Conflicts:
#	connectors/translator-amazon-s3/src/main/java/org/teiid/translator/amazon/s3/S3ProcedureExecution.java


  Commit: 4438d8be76b0ac2e9a466acffce73f745b372063
      https://github.com/teiid/teiid/commit/4438d8be76b0ac2e9a466acffce73f745b372063
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-10-27 (Fri, 27 Oct 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java

  Log Message:
  -----------
  TEIID-5125 making compatible with 1.6


  Commit: c625f3382d4fc50ffcf8e641a554b5a5eb56dd76
      https://github.com/teiid/teiid/commit/c625f3382d4fc50ffcf8e641a554b5a5eb56dd76
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-11-06 (Mon, 06 Nov 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
    M test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java
    A test-integration/common/src/test/resources/TestSystemVirtualModel/testUsage.expected
    R test-integration/common/src/test/resources/TestSystemVirtualModel/testUsgae.expected

  Log Message:
  -----------
  TEIID-5137 correcting the schema/name columns (#1033)


  Commit: 1f1f5f14ff9cb1db20aea3bc795e1bd4411ecf5d
      https://github.com/teiid/teiid/commit/1f1f5f14ff9cb1db20aea3bc795e1bd4411ecf5d
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-11-07 (Tue, 07 Nov 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/dqp/internal/process/DQPCore.java
    M engine/src/test/java/org/teiid/dqp/internal/process/TestDQPCore.java
    M engine/src/test/java/org/teiid/dqp/service/AutoGenDataService.java

  Log Message:
  -----------
  TEIID-5132 exactly enforcing max active plans


  Commit: 7d346d934813b255d3746a99d664a03022e3e728
      https://github.com/teiid/teiid/commit/7d346d934813b255d3746a99d664a03022e3e728
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-11-08 (Wed, 08 Nov 2017)

  Changed paths:
    M engine/src/main/java/org/teiid/query/xquery/saxon/PathMapFilter.java
    M engine/src/main/java/org/teiid/query/xquery/saxon/XQueryEvaluator.java
    M engine/src/test/java/org/teiid/query/processor/TestSQLXMLProcessing.java

  Log Message:
  -----------
  TEIID-5133 addressing streaming xml atomized node test (#1035)


  Commit: 14392ddd8d0a2cd08fc4923a81cdb91ae4fb9c41
      https://github.com/teiid/teiid/commit/14392ddd8d0a2cd08fc4923a81cdb91ae4fb9c41
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-11-10 (Fri, 10 Nov 2017)

  Changed paths:
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PIExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PIMetadataProcessor.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PISQLConversionVisitor.java
    M connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/pi/TestPIExecutionFactory.java

  Log Message:
  -----------
  OsiSoftPi changes for jiras TEIID-5116, TEIID-5117, TEIID-5118, TEIID-5120, TEIID-5122 (#1036)


  Commit: 79e1188e255b9afad3c1b8441f0b97d2d0832bd9
      https://github.com/teiid/teiid/commit/79e1188e255b9afad3c1b8441f0b97d2d0832bd9
  Author: Van Halbert <vhalbert at jboss.org>
  Date:   2017-11-13 (Mon, 13 Nov 2017)

  Changed paths:
    M api/src/main/java/org/teiid/language/SubqueryComparison.java
    M api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PIExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PISQLConversionVisitor.java
    M connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/pi/TestPIExecutionFactory.java

  Log Message:
  -----------
  TEIID-5127, TEIID-5141, TEIID-5124 : Fix PI related issues (#1039)

* OsiSoftPi changes for jiras TEIID-5116, TEIID-5117, TEIID-5118, TEIID-5120, TEIID-5122

* TEIID-5127, TEIID-5141, TEIID-5124 : Fix PI related issues


  Commit: 2b97413a68e71102194a2e822b2accc4f717254d
      https://github.com/teiid/teiid/commit/2b97413a68e71102194a2e822b2accc4f717254d
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-11-14 (Tue, 14 Nov 2017)

  Changed paths:
    M api/src/main/java/org/teiid/language/SubqueryComparison.java
    M api/src/main/java/org/teiid/language/visitor/SQLStringVisitor.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PISQLConversionVisitor.java

  Log Message:
  -----------
  TEIID-5141 refining to not change the api


  Commit: 4572c3bb71a71d3333ae217908dc1123b40dd4a9
      https://github.com/teiid/teiid/commit/4572c3bb71a71d3333ae217908dc1123b40dd4a9
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java

  Log Message:
  -----------
  TEIID-4466 correcting the synchronization


  Commit: 8f712332bb1f8494aac8691cd2f959e776e6a149
      https://github.com/teiid/teiid/commit/8f712332bb1f8494aac8691cd2f959e776e6a149
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java
    M connectors/translator-google/src/test/java/org/teiid/translator/google/TestSQLtoSpreadsheetQuery.java

  Log Message:
  -----------
  TEIID-4845 fix for boolean predicate update/delete


  Commit: 5a55653852e87f5728c3ff77af30c5a651ac848c
      https://github.com/teiid/teiid/commit/5a55653852e87f5728c3ff77af30c5a651ac848c
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M connectors/connector-google/src/main/java/org/teiid/resource/adapter/google/SpreadsheetConnectionImpl.java
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/GoogleSpreadsheetConnection.java
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/gdata/GDataClientLoginAPI.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/SpreadsheetUpdateExecution.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetCriteriaVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetDeleteVisitor.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetUpdateVisitor.java

  Log Message:
  -----------
  TEIID-4870 fix for string values that are not part of the change set
# Conflicts:
#	connectors/google-api/src/main/java/org/teiid/resource/adapter/google/gdata/GDataClientLoginAPI.java


  Commit: 5cd7c08c373d39b3ddb4aac7becc224b85e65892
      https://github.com/teiid/teiid/commit/5cd7c08c373d39b3ddb4aac7becc224b85e65892
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-11-20 (Mon, 20 Nov 2017)

  Changed paths:
    M connectors/translator-google/src/main/java/org/teiid/translator/google/SpreadsheetUpdateExecution.java
    M connectors/translator-google/src/main/java/org/teiid/translator/google/visitor/SpreadsheetInsertVisitor.java
    M connectors/translator-google/src/test/java/org/teiid/translator/google/TestSQLtoSpreadsheetQuery.java

  Log Message:
  -----------
  TEIID-5166 fix to use sheet title for insert
# Conflicts:
#	connectors/translator-google/src/test/java/org/teiid/translator/google/TestSQLtoSpreadsheetQuery.java


  Commit: a8add15ed64341c72f1abf736c2a9a4344071b79
      https://github.com/teiid/teiid/commit/a8add15ed64341c72f1abf736c2a9a4344071b79
  Author: shawkins <shawkins at redhat.com>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
    M test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java

  Log Message:
  -----------
  TEIID-4290 changing savepoint rollback to be a no op
Conflicts:
	runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java
	runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java

# Conflicts:
#	test-integration/common/src/test/java/org/teiid/transport/TestODBCSocketTransport.java


  Commit: 2a06f76a1f392ac12acabe0c9ca3763ad7210fa3
      https://github.com/teiid/teiid/commit/2a06f76a1f392ac12acabe0c9ca3763ad7210fa3
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2017-11-28 (Tue, 28 Nov 2017)

  Changed paths:
    M olingo/src/main/java/org/teiid/olingo/service/DocumentNode.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataExpressionToSQLVisitor.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSQLBuilder.java
    M olingo/src/main/java/org/teiid/olingo/service/ODataSchemaBuilder.java
    M olingo/src/test/java/org/teiid/olingo/TestODataIntegration.java
    M olingo/src/test/java/org/teiid/olingo/TestODataSQLBuilder.java
    M olingo/src/test/resources/loopy-edmx-metadata.xml
    M olingo/src/test/resources/loopy-vdb.xml

  Log Message:
  -----------
  TEIID-5171 correcting forward navigation of self relationships
also refactoring so that predicate building is shared and simplified the
schema generation logic


  Commit: 28060575413d938d33c52d6381ae61129aadb834
      https://github.com/teiid/teiid/commit/28060575413d938d33c52d6381ae61129aadb834
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2018-01-08 (Mon, 08 Jan 2018)

  Changed paths:
    M runtime/src/main/java/org/teiid/deployers/TranslatorUtil.java
    M runtime/src/test/java/org/teiid/deployers/TestTranslatorUtil.java

  Log Message:
  -----------
  TEIID-5182: fixed the spaces in the allowed values for extension metadata proeprties in a translator (#1043) (#1045)


  Commit: 95ff985b3d75a9f32f318f6046892f16733fb3ae
      https://github.com/teiid/teiid/commit/95ff985b3d75a9f32f318f6046892f16733fb3ae
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PIExecutionFactory.java
    M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/pi/PISQLConversionVisitor.java
    M connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/pi/TestPIExecutionFactory.java
    M connectors/translator-jdbc/src/test/resources/pi.ddl

  Log Message:
  -----------
  TEIID-5195, TEIID-5194, TEIID-5192, TEIID-5191, TEIID-5196, TEIID-5197 (#1046)


  Commit: f152f34b2fd1fc62c6f34ded359c9db44b20763c
      https://github.com/teiid/teiid/commit/f152f34b2fd1fc62c6f34ded359c9db44b20763c
  Author: Ramesh Reddy <rareddy at jboss.org>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M pom.xml
    M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java

  Log Message:
  -----------
  TEIID-5206: allowing exponential values in odata payloads. upgraded the olingo library (#1048)


  Commit: 207f695aedf1c9c1ba5ed0cf5521ada281ab0b91
      https://github.com/teiid/teiid/commit/207f695aedf1c9c1ba5ed0cf5521ada281ab0b91
  Author: shawkins <shawkins at redhat.com>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M connectors/google-api/src/main/java/org/teiid/resource/adapter/google/gdata/GDataClientLoginAPI.java

  Log Message:
  -----------
  TEIID-5203 filtering columns with no label from the update logic
# Conflicts:
#	connectors/google/connector-google/src/test/java/org/teiid/resource/adapter/google/dataprotocol/TestGoogleDataProtocolAPI.java


  Commit: 01b968a220e981ee820ab1b07df148833eb8b995
      https://github.com/teiid/teiid/commit/01b968a220e981ee820ab1b07df148833eb8b995
  Author: Steven Hawkins <shawkins at redhat.com>
  Date:   2018-01-09 (Tue, 09 Jan 2018)

  Changed paths:
    M pom.xml
    M test-integration/common/src/test/java/org/teiid/arquillian/IntegrationTestOData4.java

  Log Message:
  -----------
  Merge branch '64-8.12.x' of github.com:teiid/teiid into 64-8.12.x


  Commit: 7719fc20f95783eb15d4ae6662c5c814d97189d5
      https://github.com/teiid/teiid/commit/7719fc20f95783eb15d4ae6662c5c814d97189d5
  Author: shawkins <shawkins at redhat.com>
  Date:   2018-02-14 (Wed, 14 Feb 2018)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M runtime/src/main/java/org/teiid/odbc/ScriptReader.java
    M runtime/src/test/java/org/teiid/odbc/TestScriptReader.java

  Log Message:
  -----------
  TEIID-5176: adding handling for driver escape functions (Postgresql ODBC driver converts {fn CONCAT()} calls to a "textcat()" function)


  Commit: 2031c3a69474dc42e5f925a68e9164a5c3282e2f
      https://github.com/teiid/teiid/commit/2031c3a69474dc42e5f925a68e9164a5c3282e2f
  Author: shawkins <shawkins at redhat.com>
  Date:   2018-02-20 (Tue, 20 Feb 2018)

  Changed paths:
    M build/kits/jboss-as7/overlay/docs/teiid/teiid-releasenotes.html
    M client/src/main/java/org/teiid/jdbc/StatementImpl.java
    M client/src/test/java/org/teiid/jdbc/TestStatement.java

  Log Message:
  -----------
  TEIID-4950:  PostgreSQL Linux ODBC driver v09.06.0100 and newer does not work with Teiid Server 9.1.1 (expanding set statement syntax)


Compare: https://github.com/teiid/teiid/compare/45fc22149774^...2031c3a69474


More information about the teiid-commits mailing list