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.11' into trunk
Date Tue, 05 Mar 2019 21:45:59 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit b66fb62829ea38701d39504019f511ca41a06be6
Merge: 6b3ea1e b780f62
Author: Joseph Lynch <joe.e.lynch@gmail.com>
AuthorDate: Tue Mar 5 13:41:16 2019 -0800

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --cc CHANGES.txt
index 0283be6,5a98a76..207da38
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -357,6 -5,9 +357,8 @@@ Merged from 3.0
   * Improve merkle tree size and time on heap (CASSANDRA-14096)
   * Add missing commands to nodetool_completion (CASSANDRA-14916)
   * Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004)
+ Merged from 2.2:
+  * Make tools/bin/token-generator py2/3 compatible (CASSANDRA-15012)
 - * Multi-version in-JVM dtests (CASSANDRA-14937)
  
  
  3.11.4


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


Mime
View raw message