cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vinayche...@apache.org
Subject [cassandra] 01/01: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Tue, 05 Mar 2019 23:45:11 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 2cd4500990c5d99ea0c3479cf1046e686135aadf
Merge: 64ebd88 53db417
Author: Vinay Chella <vinaykumarcse@gmail.com>
AuthorDate: Tue Mar 5 15:34:06 2019 -0800

    Merge branch 'cassandra-2.2' into cassandra-3.0

 CHANGES.txt          | 1 +
 doc/cql3/CQL.textile | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 51e624f,28d13bc..868aa21
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -2.2.15
 +3.0.19
 + * 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)
 + * Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004)
 + 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