>From Michael Blow <mb...@apache.org>: Michael Blow has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 )
Change subject: Merge branch 'gerrit/trinity' into 'master' ...................................................................... Merge branch 'gerrit/trinity' into 'master' Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 --- M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java M asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/ClientRequest.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml 8 files changed, 38 insertions(+), 16,224 deletions(-) Approvals: Jenkins: Verified Ian Maxon: Verified Michael Blow: Looks good to me, approved -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18228 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853a524 Gerrit-Change-Number: 18228 Gerrit-PatchSet: 3 Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Ian Maxon <ima...@uci.edu> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-MessageType: merged
