cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joly...@apache.org
Subject [cassandra] 01/01: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Wed, 06 Mar 2019 00:11:56 GMT
This is an automated email from the ASF dual-hosted git repository.

jolynch pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 036fff393771240521f24f5837ac16040a872ecd
Merge: 555c6d2 67d6132
Author: Joseph Lynch <joe.e.lynch@gmail.com>
AuthorDate: Tue Mar 5 16:05:53 2019 -0800

    Merge branch 'cassandra-3.0' into cassandra-3.11

 CHANGES.txt | 1 -
 1 file changed, 1 deletion(-)

diff --cc CHANGES.txt
index 4fe82e1,027beb2..2e1234b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,10 +1,12 @@@
 -3.0.19
 +3.11.5
 + * Add flag to disable SASI indexes, and warnings on creation (CASSANDRA-14866)
 +Merged from 3.0:
   * Improve `nodetool status -r` speed (CASSANDRA-14847)
   * Improve merkle tree size and time on heap (CASSANDRA-14096)
 - * Add missing commands to nodetool-completion (CASSANDRA-14916)
 + * Add missing commands to nodetool_completion (CASSANDRA-14916)
   * Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004)
 - Merged from 2.2:
 +Merged from 2.2:
   * Fixing invalid CQL in security documentation (CASSANDRA-15020)
-  * Make tools/bin/token-generator py2/3 compatible (CASSANDRA-15012)
   * Multi-version in-JVM dtests (CASSANDRA-14937)
  
  


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message