diff --git a/CHANGES.txt b/CHANGES.txt index 361407171f..c0c02ad259 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,7 +4,7 @@ * Fix cassandra-env.sh to use $CASSANDRA_CONF to find cassandra-jaas.config (CASSANDRA-14305) * Fixed nodetool cfstats printing index name twice (CASSANDRA-14903) * Add flag to disable SASI indexes, and warnings on creation (CASSANDRA-14866) -Merged from 3.0:a +Merged from 3.0: * Add ability to cap max negotiable protocol version (CASSANDRA-15193) * Gossip tokens on startup if available (CASSANDRA-15335) * Fix resource leak in CompressedSequentialWriter (CASSANDRA-15340) diff --git a/NEWS.txt b/NEWS.txt index 2aa6deba8e..68dbeb73cc 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -47,8 +47,8 @@ using the provided 'sstableupgrade' tool. Upgrading --------- - - repair_session_max_tree_depth setting has been added to cassandra.yaml to allow operators to reduce - merkle tree size if repair is creating too much heap pressure. See CASSANDRA-14096 for details. + - repair_session_max_tree_depth setting has been added to cassandra.yaml to allow operators to reduce + merkle tree size if repair is creating too much heap pressure. See CASSANDRA-14096 for details. - native_transport_max_negotiable_protocol_version has been added to cassandra.yaml to allow operators to enforce an upper limit on the version of the native protocol that servers will negotiate with clients. This can be used during upgrades from 2.1 to 3.0 to prevent errors due to incompatible paging state formats diff --git a/debian/changelog b/debian/changelog index b9775bf2a7..bf1d4d34a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ cassandra (3.11.5) unstable; urgency=medium * New release - -- Michael Shuler Mon, 11 Feb 2019 21:12:23 -0600 + -- Michael Shuler Thu, 24 Oct 2019 08:59:29 -0500 cassandra (3.11.4) unstable; urgency=medium