>From Michael Blow <mb...@apache.org>: Michael Blow has uploaded this change for review. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 )
Change subject: Merge branch 'gerrit/trinity' into 'master' ...................................................................... Merge branch 'gerrit/trinity' into 'master' Change-Id: I28867c5e66871402d09f24b4eea254c9758f3a65 --- M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java R hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/util/string/UTF8CharBuffer.java M hyracks-fullstack/hyracks/hyracks-api/src/main/resources/errormsg/en.properties D hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml M hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml M asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties M hyracks-fullstack/hyracks/hyracks-data/hyracks-data-std/src/main/java/org/apache/hyracks/data/std/primitive/UTF8StringPointable.java 11 files changed, 74 insertions(+), 16,821 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/92/17992/1 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17992 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: I28867c5e66871402d09f24b4eea254c9758f3a65 Gerrit-Change-Number: 17992 Gerrit-PatchSet: 1 Gerrit-Owner: Michael Blow <mb...@apache.org> Gerrit-MessageType: newchange
