This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bb126c038b23df8b5daaba64cd17079b7af999df
Merge: 5d72cdd 54aeb50
Author: Mick Semb Wever <m...@apache.org>
AuthorDate: Mon Aug 12 18:17:34 2019 +0200
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --cc CHANGES.txt
index 5da96e6,41ddef6..617bcc4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,10 @@@
-3.0.19
+3.11.5
+ * Make sure user defined compaction transactions are always closed
(CASSANDRA-15123)
+ * 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:
- * Fix NPE when using allocate_tokens_for_keyspace on new DC/rack
(CASSANDRA-14592)
+ * Fix NPE when using allocate_tokens_for_keyspace on new DC/rack
(CASSANDRA-14952)
* Filter sstables earlier when running cleanup (CASSANDRA-15100)
* Use mean row count instead of mean column count for index selectivity
calculation (CASSANDRA-15259)
* Avoid updating unchanged gossip states (CASSANDRA-15097)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
