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:43 UTC
[cassandra] 01/01: Merge branch '14951-3.0' into 14951-3.11
This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 25b72d08c000d6c09d76b2b117d79cb504d14f1a
Merge: 62f0280 a9d1af9
Author: Ariel Weisberg <aw...@apple.com>
AuthorDate: Tue Jan 15 18:08:18 2019 -0500
Merge branch '14951-3.0' into 14951-3.11
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 477afd8,5faac66..009e8d4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,5 +1,8 @@@
-3.0.18
+3.11.4
+ * 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org