You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@asterixdb.apache.org by mb...@apache.org on 2020/03/11 22:20:39 UTC

[asterixdb] 03/03: Merge branch 'gerrit/mad-hatter'

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit a62452ee56043f4f9e85ffc6f071e5b9c908d8fc
Merge: f15af5c b5727c6
Author: Michael Blow <mb...@apache.org>
AuthorDate: Wed Mar 11 16:02:23 2020 -0400

    Merge branch 'gerrit/mad-hatter'
    
    Change-Id: Iafa7f65f3c0c629c2b0eb53ee48ec98a3cb2c7c2

 .../rules/PushAggregateIntoNestedSubplanRule.java  | 29 ++++++--------
 .../queries/window/win_opt_01/win_opt_01_12.sqlpp  | 31 +++++++++++++++
 .../results/window/win_opt_01/win_opt_01_12.plan   | 24 ++++++++++++
 .../window/win_opt_01/win_opt_01.12.query.sqlpp    | 31 +++++++++++++++
 .../results/window/win_opt_01/win_opt_01.12.adm    |  4 ++
 asterixdb/asterix-server/pom.xml                   |  4 +-
 asterixdb/pom.xml                                  | 14 +++----
 .../appended-resources/supplemental-models.xml     | 23 +++++------
 ....com_netty_netty_netty-4.1.46.Final_NOTICE.txt} | 11 +++++-
 .../license-automation-plugin/pom.xml              |  4 --
 .../hyracks/hyracks-maven-plugins/pom.xml          |  1 -
 hyracks-fullstack/pom.xml                          | 45 +++++++++++++++++-----
 12 files changed, 167 insertions(+), 54 deletions(-)