diff --git a/CHANGES.txt b/CHANGES.txt index 96a54d4303..a442f11938 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -34,6 +34,8 @@ Merged from 3.0: * MigrationManager attempts to pull schema from different major version nodes (CASSANDRA-14928) * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262) * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377) +Merged from 2.1: + * Update release checksum algorithms to SHA-256, SHA-512 (CASSANDRA-14970) 3.11.3 diff --git a/build.xml b/build.xml index 8fefd176e2..c369cf346f 100644 --- a/build.xml +++ b/build.xml @@ -1142,14 +1142,14 @@ - + - +