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/11/07 17:33:47 UTC

[cassandra] branch cassandra-4.1 updated (acda6fad68 -> 9dcba20866)

This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a change to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git


    from acda6fad68 Bug fix for WriteTimeoutException when using Paxos v2 with a single datacenter
     new 7dbbe6907b CircleCI: Fix j11_utests_fqltool executor
     new 9dcba20866 Merge branch 'cassandra-4.0' into cassandra-4.1

The 2 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     | 2 +-
 .circleci/config.yml         | 7 ++++---
 .circleci/config.yml.HIGHRES | 7 ++++---
 .circleci/config.yml.LOWRES  | 7 ++++---
 .circleci/config.yml.MIDRES  | 7 ++++---
 5 files changed, 17 insertions(+), 13 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 cassandra-4.1

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adelapena pushed a commit to branch cassandra-4.1
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 9dcba208667589aa2309e86cfdd90c7d09682ff1
Merge: acda6fad68 7dbbe6907b
Author: Andrés de la Peña <a....@gmail.com>
AuthorDate: Mon Nov 7 17:31:02 2022 +0000

    Merge branch 'cassandra-4.0' into cassandra-4.1

 .circleci/config-2_1.yml     | 2 +-
 .circleci/config.yml         | 7 ++++---
 .circleci/config.yml.HIGHRES | 7 ++++---
 .circleci/config.yml.LOWRES  | 7 ++++---
 .circleci/config.yml.MIDRES  | 7 ++++---
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --cc .circleci/config.yml
index 238c4f12bf,ca564102a1..64d2e8f9a9
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@@ -1956,10 -2402,10 +1956,11 @@@ jobs
      - REPEATED_ANT_TEST_TARGET: testsome
      - REPEATED_ANT_TEST_CLASS: null
      - REPEATED_ANT_TEST_METHODS: null
 +    - REPEATED_ANT_TEST_VNODES: false
      - REPEATED_ANT_TEST_COUNT: 500
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - CASSANDRA_USE_JDK11: true
    j8_utests_system_keyspace_directory:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
diff --cc .circleci/config.yml.HIGHRES
index d855f4dd94,e027af8dd6..2f411f18da
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@@ -1956,10 -2402,10 +1956,11 @@@ jobs
      - REPEATED_ANT_TEST_TARGET: testsome
      - REPEATED_ANT_TEST_CLASS: null
      - REPEATED_ANT_TEST_METHODS: null
 +    - REPEATED_ANT_TEST_VNODES: false
      - REPEATED_ANT_TEST_COUNT: 500
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - CASSANDRA_USE_JDK11: true
    j8_utests_system_keyspace_directory:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
diff --cc .circleci/config.yml.LOWRES
index 1e0d88ab51,a056b63876..33923d8e69
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@@ -1956,10 -2402,10 +1956,11 @@@ jobs
      - REPEATED_ANT_TEST_TARGET: testsome
      - REPEATED_ANT_TEST_CLASS: null
      - REPEATED_ANT_TEST_METHODS: null
 +    - REPEATED_ANT_TEST_VNODES: false
      - REPEATED_ANT_TEST_COUNT: 500
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - CASSANDRA_USE_JDK11: true
    j8_utests_system_keyspace_directory:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest
diff --cc .circleci/config.yml.MIDRES
index d903332c3b,88e6977806..50dffc5791
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@@ -1956,10 -2402,10 +1956,11 @@@ jobs
      - REPEATED_ANT_TEST_TARGET: testsome
      - REPEATED_ANT_TEST_CLASS: null
      - REPEATED_ANT_TEST_METHODS: null
 +    - REPEATED_ANT_TEST_VNODES: false
      - REPEATED_ANT_TEST_COUNT: 500
-     - JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
-     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
+     - JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - JDK_HOME: /usr/lib/jvm/java-11-openjdk-amd64
+     - CASSANDRA_USE_JDK11: true
    j8_utests_system_keyspace_directory:
      docker:
      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:latest


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org