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

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

commit 5b660c845b81d270217512e32afea08d827aebca
Merge: b66fb62 555c6d2
Author: Vinay Chella <vinaykumarcse@gmail.com>
AuthorDate: Tue Mar 5 15:39:51 2019 -0800

    Merge branch 'cassandra-3.11' into trunk

 CHANGES.txt                 | 1 +
 doc/cql3/CQL.textile        | 8 ++++----
 doc/source/cql/security.rst | 8 ++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --cc CHANGES.txt
index 207da38,4fe82e1..a264236
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -358,7 -6,9 +358,8 @@@ Merged from 3.0
   * 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)
  
  
  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