This is an automated email from the ASF dual-hosted git repository. stefania pushed a commit to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit fe263ad9e98c1d43eef74b88fcb111b697f619ef Merge: e3f54d4 c8081c2 Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> AuthorDate: Thu Apr 9 08:58:55 2020 -0400 Merge branch 'cassandra-2.2' into cassandra-3.0 CHANGES.txt | 2 ++ pylib/cqlshlib/copyutil.py | 4 ++-- pylib/cqlshlib/formatting.py | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --cc CHANGES.txt index 2d14e34,56dd315..eb0b66e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,8 -1,9 +1,10 @@@ -2.2.18 +3.0.21 + * Memtable memory allocations may deadlock (CASSANDRA-15367) + * Run evictFromMembership in GossipStage (CASSANDRA-15592) +Merged from 2.2: * Disable JMX rebinding (CASSANDRA-15653) + Merged from 2.1: + * Fix parse error in cqlsh COPY FROM and formatting for map of blobs (CASSANDRA-15679) - -2.2.17 * Fix Commit log replays when static column clustering keys are collections (CASSANDRA-14365) * Fix Red Hat init script on newer systemd versions (CASSANDRA-15273) * Allow EXTRA_CLASSPATH to work on tar/source installations (CASSANDRA-15567) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org