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 50027f52322b7c0006c0b3c51cc6517c252e7e59
Merge: 5b660c8 036fff3
Author: Joseph Lynch <joe.e.ly...@gmail.com>
AuthorDate: Tue Mar 5 16:06:36 2019 -0800
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
diff --cc CHANGES.txt
index a264236,2e1234b..a24eeea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -359,7 -7,7 +359,6 @@@ Merged from 3.0
* 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-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
