Merge branch 'cassandra-2.2' into cassandra-3.0

.circleci/config-2_1.yml

@@ -117,7 +117,7 @@ executors:
         type: string
         default: medium
     docker:
-      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+      - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: << parameters.exec_resource_class >>
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l

.circleci/config.yml.HIGHRES

@@ -2,7 +2,7 @@ version: 2
 jobs:
   j8_jvm_upgrade_dtests:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -94,7 +94,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   build:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -175,7 +175,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_dtests-no-vnodes:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -233,7 +233,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_upgradetests-no-vnodes:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -332,7 +332,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_unit_tests:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -424,7 +424,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_dtests-with-vnodes:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -482,7 +482,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_jvm_dtests:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -574,7 +574,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   utests_long:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -620,7 +620,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   utests_compression:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: xlarge
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -712,7 +712,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_dtest_jars_build:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l

.circleci/config.yml.LOWRES

@@ -2,7 +2,7 @@ version: 2
 jobs:
   j8_jvm_upgrade_dtests:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -94,7 +94,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   build:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -175,7 +175,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_dtests-no-vnodes:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -233,7 +233,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_upgradetests-no-vnodes:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -332,7 +332,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_unit_tests:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -424,7 +424,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_dtests-with-vnodes:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -482,7 +482,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_jvm_dtests:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -574,7 +574,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   utests_long:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -620,7 +620,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   utests_compression:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l
@@ -712,7 +712,7 @@ jobs:
     - JDK_HOME: /usr/lib/jvm/java-8-openjdk-amd64
   j8_dtest_jars_build:
     docker:
-    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
+    - image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210304
     resource_class: medium
     working_directory: ~/
     shell: /bin/bash -eo pipefail -l