Branch: refs/heads/9.1.x Home: https://github.com/teiid/teiid Commit: 8785b55e9e43d7a4ae51b51d558a49f8debf2742 https://github.com/teiid/teiid/commit/8785b55e9e43d7a4ae51b51d558a49f8deb... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-12-08 (Thu, 08 Dec 2016) Changed paths: M engine/src/main/java/org/teiid/query/QueryPlugin.java M engine/src/main/java/org/teiid/query/function/FunctionDescriptor.java M engine/src/main/java/org/teiid/query/function/FunctionTree.java M engine/src/main/java/org/teiid/query/function/aggregate/UserDefined.java M engine/src/main/java/org/teiid/query/optimizer/relational/PlanToProcessConverter.java M engine/src/main/java/org/teiid/query/processor/relational/GroupingNode.java M engine/src/main/resources/org/teiid/query/i18n.properties M engine/src/test/java/org/teiid/query/processor/TestWindowFunctions.java Log Message: ----------- TEIID-4598 adding better exception handling for a user defined aggregate function that must be pushed # Conflicts: # engine/src/main/java/org/teiid/query/QueryPlugin.java # engine/src/main/resources/org/teiid/query/i18n.properties Commit: 9846eb6a8f7f759dfcb579506ed58369071a6b8a https://github.com/teiid/teiid/commit/9846eb6a8f7f759dfcb579506ed58369071... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M api/src/main/java/org/teiid/language/Condition.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/JDBCExecutionFactory.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/db2/DB2ExecutionFactory.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/ingres/IngresExecutionFactory.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/oracle/OracleExecutionFactory.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/sybase/BaseSybaseExecutionFactory.java M connectors/translator-jdbc/src/main/java/org/teiid/translator/jdbc/teradata/TeradataExecutionFactory.java M connectors/translator-jdbc/src/test/java/org/teiid/translator/jdbc/sqlserver/TestSqlServerConversionVisitor.java M engine/src/main/java/org/teiid/dqp/internal/datamgr/LanguageBridgeFactory.java Log Message: ----------- TEIID-4631 allowing for nested boolean expressions Commit: c762f3b3c7cb861b842b6c5dd64ab7fc4a13648b https://github.com/teiid/teiid/commit/c762f3b3c7cb861b842b6c5dd64ab7fc4a1... Author: shawkins <shawkins(a)redhat.com&gt; Date: 2016-12-09 (Fri, 09 Dec 2016) Changed paths: M connectors/simpledb-api/pom.xml M connectors/translator-simpledb/kits/wildfly-dist.xml A connectors/translator-simpledb/kits/wildfly/modules/com/amazonaws/main/module.xml A connectors/translator-simpledb/kits/wildfly/modules/com/fasterxml/jackson/dataformat/cbor/main/module.xml M connectors/translator-simpledb/kits/wildfly/modules/org/jboss/teiid/translator/simpledb/api/main/module.xml M pom.xml Log Message: ----------- Merge branch '9.1.x' of github.com:teiid/teiid into 9.1.x Compare: https://github.com/teiid/teiid/compare/2658f58515d7...c762f3b3c7cb