You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ad...@apache.org on 2021/10/19 10:46:29 UTC
[cassandra] branch trunk updated (5a88bc8 -> 3a950b4)
This is an automated email from the ASF dual-hosted git repository.
adelapena pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 5a88bc8 Merge branch 'cassandra-4.0' into trunk
new ee6cd06 Use dedicated executors for CircleCI repeated test jobs
new 7e95c92 Merge branch 'cassandra-3.0' into cassandra-3.11
new 72f3b79 Merge branch 'cassandra-3.11' into cassandra-4.0
new 3a950b4 Merge branch 'cassandra-4.0' into trunk
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-4.0' into trunk
Posted by ad...@apache.org.
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....@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org