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 2022/10/18 15:59:23 UTC
[cassandra] branch trunk updated (81f9068b11 -> 0ab2aa25d4)
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 81f9068b11 Merge branch 'cassandra-4.1' into trunk
new 9aa28a81ec CircleCI: Automatically detect and repeat new or modified JUnit tests
new f13cdddcad Merge branch 'cassandra-3.0' into cassandra-3.11
new cc622a20e1 Merge branch 'cassandra-3.11' into cassandra-4.0
new 36e73bdf55 Merge branch 'cassandra-4.0' into cassandra-4.1
new 0ab2aa25d4 Merge branch 'cassandra-4.1' into trunk
The 5 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 | 1005 ++++--
.circleci/config-2_1.yml.high_res.patch | 10 +-
.circleci/config-2_1.yml.mid_res.patch | 64 +-
.circleci/config.yml | 5003 ++++++++++++++++++-----------
.circleci/config.yml.HIGHRES | 5191 +++++++++++++++++++-----------
.circleci/config.yml.LOWRES | 5193 ++++++++++++++++++++-----------
.circleci/config.yml.MIDRES | 5151 +++++++++++++++++++-----------
.circleci/generate.sh | 170 +-
.circleci/readme.md | 99 +-
9 files changed, 14480 insertions(+), 7406 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.1' 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 0ab2aa25d46e743c9a1f5a325bcf96541a3f0e5b
Merge: 81f9068b11 36e73bdf55
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Tue Oct 18 16:55:07 2022 +0100
Merge branch 'cassandra-4.1' into trunk
.circleci/config-2_1.yml | 1005 ++++--
.circleci/config-2_1.yml.high_res.patch | 10 +-
.circleci/config-2_1.yml.mid_res.patch | 64 +-
.circleci/config.yml | 5003 ++++++++++++++++++-----------
.circleci/config.yml.HIGHRES | 5191 +++++++++++++++++++-----------
.circleci/config.yml.LOWRES | 5193 ++++++++++++++++++++-----------
.circleci/config.yml.MIDRES | 5151 +++++++++++++++++++-----------
.circleci/generate.sh | 170 +-
.circleci/readme.md | 99 +-
9 files changed, 14480 insertions(+), 7406 deletions(-)
diff --cc .circleci/config-2_1.yml.high_res.patch
index 36fabbdf08,8ec657fd83..feeab90daf
--- a/.circleci/config-2_1.yml.high_res.patch
+++ b/.circleci/config-2_1.yml.high_res.patch
@@@ -1,6 -1,6 +1,6 @@@
- --- config-2_1.yml 2022-05-30 12:09:35.000000000 -0400
- +++ config-2_1.yml.HIGHRES 2022-05-30 12:10:16.000000000 -0400
- @@ -105,14 +105,14 @@
---- config-2_1.yml 2022-10-15 12:44:53.878216263 +0100
-+++ config-2_1.yml.HIGHRES 2022-10-15 12:45:49.850511983 +0100
++--- config-2_1.yml 2022-10-15 12:44:53.884924328 +0100
+++++ config-2_1.yml.HIGHRES 2022-10-15 12:45:37.970163268 +0100
+ @@ -148,14 +148,14 @@
j8_par_executor: &j8_par_executor
executor:
name: java8-executor
diff --cc .circleci/config-2_1.yml.mid_res.patch
index 90995a744a,a410c9b111..6417c470b2
--- 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-05-30 12:09:35.000000000 -0400
- +++ config-2_1.yml.MIDRES 2022-05-30 12:10:10.000000000 -0400
- @@ -105,14 +105,14 @@
---- config-2_1.yml 2022-10-15 12:44:53.878216263 +0100
-+++ config-2_1.yml.MIDRES 2022-10-15 12:45:49.843904887 +0100
++--- config-2_1.yml 2022-10-15 12:44:53.884924328 +0100
+++++ config-2_1.yml.MIDRES 2022-10-15 12:45:37.963422950 +0100
+ @@ -148,14 +148,14 @@
j8_par_executor: &j8_par_executor
executor:
name: java8-executor
diff --cc .circleci/generate.sh
index f632d989c6,f6f63a85fc..60c9d16c77
--- a/.circleci/generate.sh
+++ b/.circleci/generate.sh
@@@ -18,6 -18,7 +18,7 @@@
#
BASEDIR=`dirname $0`
-BASE_BRANCH=cassandra-4.1
++BASE_BRANCH=trunk
die ()
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org