You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by aw...@apache.org on 2019/01/16 00:20:45 UTC
[cassandra] 01/01: Merge branch '14951-3.11' into 14951-trunk
This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c291e8d81585d64e6d14349ca512bf0048689e91
Merge: a43b651 25b72d0
Author: Ariel Weisberg <aw...@apple.com>
AuthorDate: Tue Jan 15 18:08:31 2019 -0500
Merge branch '14951-3.11' into 14951-trunk
CHANGES.txt | 1 +
pylib/cassandra-cqlsh-tests.sh | 100 +++++++++++++++++++++++++++++++++++++++++
pylib/cqlshlib/setup.cfg | 4 ++
pylib/requirements.txt | 21 +++++++++
4 files changed, 126 insertions(+)
diff --cc CHANGES.txt
index 5af5b64,009e8d4..0e1da11
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -343,9 -2,12 +343,10 @@@
* Make stop-server.bat wait for Cassandra to terminate (CASSANDRA-14829)
* Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870)
Merged from 3.0:
+ * Add a script to make running the cqlsh tests in cassandra repo easier (CASSANDRA-14951)
* If SizeEstimatesRecorder misses a 'onDropTable' notification, the size_estimates table will never be cleared for that table. (CASSANDRA-14905)
- * Counters fail to increment in 2.1/2.2 to 3.X mixed version clusters (CASSANDRA-14958)
* Streaming needs to synchronise access to LifecycleTransaction (CASSANDRA-14554)
* Fix cassandra-stress write hang with default options (CASSANDRA-14616)
- * Differentiate between slices and RTs when decoding legacy bounds (CASSANDRA-14919)
* Netty epoll IOExceptions caused by unclean client disconnects being logged at INFO (CASSANDRA-14909)
* Unfiltered.isEmpty conflicts with Row extends AbstractCollection.isEmpty (CASSANDRA-14588)
* RangeTombstoneList doesn't properly clean up mergeable or superseded rts in some cases (CASSANDRA-14894)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org