This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 4815ae7924aa669cd4eced6b72f88942c68186aa
Merge: 0cd3b68 6a6dd8a
Author: Sam Tunnicliffe <s...@beobal.com>
AuthorDate: Wed Mar 25 17:08:50 2020 +0000
Merge branch 'cassandra-2.2' into cassandra-3.0
CHANGES.txt | 1 +
.../apache/cassandra/service/CassandraDaemon.java | 62 +++++++++++++++++++++-
2 files changed, 61 insertions(+), 2 deletions(-)
diff --cc CHANGES.txt
index 9a10106,885d33e..58798fa
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,7 +1,7 @@@
-2.2.18
+3.0.21
+ * Run evictFromMembership in GossipStage (CASSANDRA-15592)
+Merged from 2.2:
+ * Disable JMX rebinding (CASSANDRA-15653)
-
-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
