natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.11

This commit is contained in:
Ekaterina Dimitrova 2022-12-23 15:01:11 -05:00
parent 0767c83416 df0b139701
commit fff313e447
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config-2_1.yml.mid_res.patch
View File

@ -1,5 +1,5 @@
--- config-2_1.yml 2022-11-05 18:28:58.000000000 -0400 --- config-2_1.yml 2022-12-23 09:43:57.000000000 -0500
+++ config-2_1.yml.MIDRES 2022-11-05 18:47:13.000000000 -0400 +++ config-2_1.yml.MIDRES 2022-12-23 09:45:18.000000000 -0500
@@ -126,45 +126,65 @@ @@ -126,45 +126,65 @@
executor: executor:
name: java8-executor name: java8-executor
@ -33,7 +33,7 @@
+j8_very_large_par_executor: &j8_very_large_par_executor +j8_very_large_par_executor: &j8_very_large_par_executor
+ executor: + executor:
+ name: java8-executor + name: java8-executor
+ exec_resource_class: xlarge + exec_resource_class: large
+ parallelism: 100 + parallelism: 100
j8_seq_executor: &j8_seq_executor j8_seq_executor: &j8_seq_executor

2
.circleci/config.yml.MIDRES
View File

@ -1339,7 +1339,7 @@ jobs:
j8_upgrade_dtests: j8_upgrade_dtests:
docker: docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
resource_class: xlarge resource_class: large
working_directory: ~/ working_directory: ~/
shell: /bin/bash -eo pipefail -l shell: /bin/bash -eo pipefail -l
parallelism: 100 parallelism: 100