This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 0b0d19a5dda1ebaf9bad4c93906dd1056209760b Merge: 59e3d6a 92ae16e Author: Michael Blow <[email protected]> AuthorDate: Tue Dec 22 11:45:35 2020 -0500 Merge branch 'gerrit/cheshire-cat' Change-Id: I3d754049b8256b3594a483733a6214ff24fc5e27 .../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} | 30 +++++++++++++++++++--- .../hyracks/control/nc/work/StartTasksWork.java | 5 ++-- .../main/java/org/apache/hyracks/util/Span.java | 14 +++------- 27 files changed, 115 insertions(+), 80 deletions(-)
