This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6d62d2f4f2efb144824a433c0f8048c8a0eeed22 Merge: 91193e0fdf bfc7621c8c Author: Andrés de la Peña <a.penya.gar...@gmail.com> AuthorDate: Fri Mar 10 11:53:47 2023 +0000 Merge branch 'cassandra-4.1' into trunk .circleci/config-2_1.yml.high_res.patch | 149 - .circleci/{config.yml.LOWRES => config.yml.FREE} | 0 .circleci/config.yml.HIGHRES | 10917 ------------------- .circleci/{config.yml.MIDRES => config.yml.PAID} | 0 .circleci/{config-2_1.yml => config_template.yml} | 0 ...id_res.patch => config_template.yml.PAID.patch} | 4 +- .circleci/generate.sh | 107 +- .circleci/readme.md | 98 +- 8 files changed, 95 insertions(+), 11180 deletions(-) diff --cc .circleci/config_template.yml.PAID.patch index f5c890c15e,098ccd25a8..0deece2f33 --- a/.circleci/config_template.yml.PAID.patch +++ b/.circleci/config_template.yml.PAID.patch @@@ -1,6 -1,6 +1,6 @@@ - --- config-2_1.yml 2023-02-02 21:26:13.000000000 -0500 - +++ config-2_1.yml.MIDRES 2023-02-02 21:27:09.000000000 -0500 ---- config-2_1.yml 2023-02-02 21:24:39.000000000 -0500 -+++ config-2_1.yml.MIDRES 2023-02-02 21:25:05.000000000 -0500 -@@ -157,14 +157,14 @@ ++--- config_template.yml 2023-02-02 21:26:13.000000000 -0500 +++++ config_template.yml.MIDRES 2023-02-02 21:27:09.000000000 -0500 +@@ -158,14 +158,14 @@ j8_par_executor: &j8_par_executor executor: name: java8-executor --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org