This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9f2005cd5788c35e412d4842d9bcf7b207f19673
Merge: 8f3c8e721e 56b332b4cf
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Sun Aug 13 17:26:01 2023 -0400
Merge branch 'cassandra-5.0' into trunk
.circleci/config.yml.PAID | 12 ++---
.circleci/config_template.yml | 8 +++-
.circleci/config_template.yml.PAID.patch | 82 ++++++++++++++++++--------------
3 files changed, 58 insertions(+), 44 deletions(-)
diff --cc .circleci/config_template.yml.PAID.patch
index affd99d7ef,e44b610607..7ca86ce04f
--- a/.circleci/config_template.yml.PAID.patch
+++ b/.circleci/config_template.yml.PAID.patch
@@@ -1,6 -1,6 +1,6 @@@
- --- config_template.yml 2023-07-24 11:55:54.000000000 -0400
- +++ config_template.yml.PAID 2023-07-24 11:58:41.000000000 -0400
- @@ -157,14 +157,14 @@
+ --- config_template.yml 2023-08-11 10:06:39.000000000 -0400
-+++ config_template.yml.PAID 2023-08-11 10:07:25.000000000 -0400
+++++ config_template.yml.PAID 2023-08-11 10:22:35.000000000 -0400
+ @@ -157,20 +157,20 @@
j11_par_executor: &j11_par_executor
executor:
name: java11-executor
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
