>From Michael Blow <[email protected]>: Michael Blow has uploaded a new patch set (#2). ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17684 )
Change subject: Merge branch 'gerrit/trinity' into 'master' ...................................................................... Merge branch 'gerrit/trinity' into 'master' Change-Id: Ia4c6bdfa9dce9437049d59e137494b2372348754 --- M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm M asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java M asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java M asterixdb/asterix-app/src/test/resources/cc-analyze.conf M asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf M asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm D asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf D asterixdb/asterix-app/src/test/resources/cc-compression.conf 12 files changed, 33 insertions(+), 195 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/84/17684/2 -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17684 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: Ia4c6bdfa9dce9437049d59e137494b2372348754 Gerrit-Change-Number: 17684 Gerrit-PatchSet: 2 Gerrit-Owner: Michael Blow <[email protected]> Gerrit-CC: Jenkins <[email protected]> Gerrit-MessageType: newpatchset
