This is an automated email from the ASF dual-hosted git repository.
mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git.
from 59e3d6a Merge branch 'gerrit/cheshire-cat'
new 8668d2e [NO ISSUE][*DB] Lock manager allocation improvements
new 4e00bb4 [NO ISSUE][HYR] Logging improvements, cleanup
new 92ae16e [NO ISSUE][HYR][UTIL] += Span.ELAPSED; misc cleanup
new 0b0d19a Merge branch 'gerrit/cheshire-cat'
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../asterix-app/src/main/resources/cc-rep.conf | 3 +-
asterixdb/asterix-app/src/main/resources/cc.conf | 1 -
asterixdb/asterix-app/src/main/resources/cc2.conf | 1 -
asterixdb/asterix-app/src/main/resources/cc3.conf | 1 -
asterixdb/asterix-app/src/main/resources/cc4.conf | 1 -
.../src/test/resources/cc-compression.conf | 1 -
.../src/test/resources/cc-multipart.conf | 1 -
.../asterix-app/src/test/resources/cc-rep-ssl.conf | 3 +-
.../asterix-app/src/test/resources/cc-single.conf | 1 -
.../test/resources/cc-small-txn-log-partition.conf | 1 -
.../asterix-app/src/test/resources/cc-ssl.conf | 3 +-
.../asterix-app/src/test/resources/cc-storage.conf | 3 +-
asterixdb/asterix-app/src/test/resources/cc.conf | 1 -
.../api/cluster_state_1/cluster_state_1.1.regexadm | 2 +-
.../cluster_state_1_full.1.regexadm | 2 +-
.../cluster_state_1_less.1.regexadm | 2 +-
.../asterix/common/config/StorageProperties.java | 10 ++---
.../common/config/TransactionProperties.java | 24 +++++++++++-
.../service/locking/ConcurrentLockManager.java | 20 +++++-----
.../management/service/locking/ResourceGroup.java | 25 +++++++------
.../service/locking/ResourceGroupTable.java | 10 ++---
.../service/locking/ResourceTablePrinter.java | 4 +-
.../org/apache/hyracks/api/dataflow/IActivity.java | 22 +++++++++--
.../runtime/SuperActivityOperatorNodePushable.java | 4 +-
.../hyracks/api/dataflow/IActivityTest.java} | 43 ++++++++++++----------
.../hyracks/control/nc/work/StartTasksWork.java | 5 +--
.../main/java/org/apache/hyracks/util/Span.java | 14 ++-----
27 files changed, 112 insertions(+), 96 deletions(-)
copy
hyracks-fullstack/hyracks/{hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java
=>
hyracks-api/src/test/java/org/apache/hyracks/api/dataflow/IActivityTest.java}
(53%)
