>From Ian Maxon <[email protected]>: Ian Maxon has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 )
Change subject: Merge branch 'gerrit/trinity' into 'master' ...................................................................... Merge branch 'gerrit/trinity' into 'master' Change-Id: I1850f4af7fcaca4649d503cbe64f6f33a853c521 --- 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/test/resources/runtimets/sqlpp_queries.xml 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 9 files changed, 43 insertions(+), 16,224 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/75/18275/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18275 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: I1850f4af7fcaca4649d503cbe64f6f33a853c521 Gerrit-Change-Number: 18275 Gerrit-PatchSet: 1 Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-MessageType: newchange
