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 5825a14f73bc3cfa8d32d7f74833a64d9fff4ad3
Merge: 7ecbad7ee8 1c2d299ad3
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Fri Dec 23 15:12:19 2022 -0500
Merge branch 'cassandra-4.1' into trunk
.circleci/config-2_1.yml.mid_res.patch | 6 +++---
.circleci/config.yml.MIDRES | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --cc .circleci/config-2_1.yml.mid_res.patch
index 77a2d95847,db78846f2e..92e984748a
--- a/.circleci/config-2_1.yml.mid_res.patch
+++ b/.circleci/config-2_1.yml.mid_res.patch
@@@ -1,6 -1,6 +1,6 @@@
- --- config-2_1.yml 2022-12-13 13:30:41.000000000 -0800
- +++ config-2_1.yml.MIDRES 2022-12-13 13:31:42.000000000 -0800
---- config-2_1.yml 2022-12-23 10:10:35.000000000 -0500
-+++ config-2_1.yml.MIDRES 2022-12-23 10:11:05.000000000 -0500
-@@ -157,14 +157,14 @@
++--- config-2_1.yml 2022-12-23 10:14:34.000000000 -0500
+++++ config-2_1.yml.MIDRES 2022-12-23 10:15:03.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
