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 3a950b45c321e051a9744721408760c568c05617 Merge: 5a88bc8 72f3b79 Author: Andrés de la Peña <a.penya.gar...@gmail.com> AuthorDate: Tue Oct 19 11:44:40 2021 +0100 Merge branch 'cassandra-4.0' into trunk .circleci/config-2_1.yml | 42 ++++++++++++--- .circleci/config-2_1.yml.high_res.patch | 48 ++++++++++++++++- .circleci/config-2_1.yml.mid_res.patch | 91 ++++++++++++++++++++++++--------- .circleci/config.yml.MIDRES | 8 +-- 4 files changed, 153 insertions(+), 36 deletions(-) diff --cc .circleci/config-2_1.yml.high_res.patch index 1a0ba53,45c54b2..79fa6ab --- a/.circleci/config-2_1.yml.high_res.patch +++ b/.circleci/config-2_1.yml.high_res.patch @@@ -1,4 -1,6 +1,6 @@@ - @@ -19,14 +19,14 @@ default_env_vars: &default_env_vars ---- .circleci/config-2_1.yml 2021-10-18 11:48:35.000000000 +0100 -+++ .circleci/config-2_1.yml.HIGHRES 2021-10-18 12:03:47.000000000 +0100 ++--- .circleci/config-2_1.yml 2021-10-18 12:30:30.000000000 +0100 +++++ .circleci/config-2_1.yml.HIGHRES 2021-10-18 15:22:24.000000000 +0100 + @@ -101,14 +101,14 @@ j8_par_executor: &j8_par_executor executor: name: java8-executor diff --cc .circleci/config-2_1.yml.mid_res.patch index 0c360d9,27df9cc..d843ea7 --- a/.circleci/config-2_1.yml.mid_res.patch +++ b/.circleci/config-2_1.yml.mid_res.patch @@@ -1,4 -1,6 +1,6 @@@ - @@ -19,14 +19,14 @@ default_env_vars: &default_env_vars ---- .circleci/config-2_1.yml 2021-10-18 11:48:35.000000000 +0100 -+++ .circleci/config-2_1.yml.MIDRES 2021-10-18 12:02:44.000000000 +0100 ++--- .circleci/config-2_1.yml 2021-10-18 12:30:30.000000000 +0100 +++++ .circleci/config-2_1.yml.MIDRES 2021-10-18 15:22:00.000000000 +0100 + @@ -101,14 +101,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