This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ff49fd92539780264b15b3e0114679841dfb8138
Merge: d2ce0ab 22a0927
Author: Brandon Williams <brandonwilli...@apache.org>
AuthorDate: Tue Jan 12 13:26:35 2021 -0600
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 8 +++++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --cc CHANGES.txt
index 7fef5a3,74eef72..a925e06
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,45 -1,10 +1,46 @@@
-3.11.10
+4.0-beta5
+ * Fix check for -Xlog in cassandra-env.sh (CASSANDRA-16279)
+ * SSLFactory should initialize SSLContext before setting protocols
(CASSANDRA-16362)
+ * Restore sasi dependencies jflex, snowball-stemmer, and concurrent-trees,
in the cassandra-all pom (CASSANDRA-16303)
* Fix DecimalDeserializer#toString OOM (CASSANDRA-14925)
- * Rate limit validation compactions using compaction_throughput_mb_per_sec
(CASSANDRA-16161)
- * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to
default of 1GB (CASSANDRA-16071)
+Merged from 3.11:
Merged from 3.0:
- * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372)
* Fix skipping on pre-3.0 created compact storage sstables due to missing
primary key liveness (CASSANDRA-16226)
++ * Allow empty string in collections with COPY FROM in cqlsh (CASSANDRA-16372
+
+4.0-beta4
+ * DROP COMPACT STORAGE should invalidate prepared statements still using
CompactTableMetadata (CASSANDRA-16361)
+ * Update default num_tokens to 16 and
allocate_tokens_for_local_replication_factor to 3 (CASSANDRA-13701)
+ * Remove use of String.intern() (CASSANDRA-15810)
+ * Fix the missing bb position in ByteBufferAccessor.getUnsignedShort
(CASSANDRA-16249)
+ * Make sure OOM errors are rethrown on truncation failure (CASSANDRA-16254)
+ * Send back client warnings when creating too many tables/keyspaces
(CASSANDRA-16309)
+ * Add dedicated tcp user timeout for streaming connection (CASSANDRA-16143)
+ * Add generatetokens script for offline token allocation strategy generation
(CASSANDRA-16205)
+ * Remove Windows scripts (CASSANDRA-16171)
+ * Improve checksumming and compression in protocol V5 (CASSANDRA-15299)
+ * Optimised repair streaming improvements (CASSANDRA-16274)
+ * Update jctools dependency to 3.1.0 (CASSANDRA-16255)
+ * 'SSLEngine closed already' exception on failed outbound connection
(CASSANDRA-16277)
+ * Drain and/or shutdown might throw because of slow messaging service
shutdown (CASSANDRA-16276)
+ * Upgrade JNA to 5.6.0, dropping support for <=glibc-2.6 systems
(CASSANDRA-16212)
+ * Add saved Host IDs to TokenMetadata at startup (CASSANDRA-16246)
+ * Ensure that CacheMetrics.requests is picked up by the metric reporter
(CASSANDRA-16228)
+ * Add a ratelimiter to snapshot creation and deletion (CASSANDRA-13019)
+ * Produce consistent tombstone for reads to avoid digest mistmatch
(CASSANDRA-15369)
+ * Fix SSTableloader issue when restoring a table named backups
(CASSANDRA-16235)
+ * Invalid serialized size for responses caused by increasing message time by
1ms which caused extra bytes in size calculation (CASSANDRA-16103)
+ * Throw BufferOverflowException from DataOutputBuffer for better visibility
(CASSANDRA-16214)
+ * TLS connections to the storage port on a node without server encryption
configured causes java.io.IOException accessing missing keystore
(CASSANDRA-16144)
+ * Internode messaging catches OOMs and does not rethrow (CASSANDRA-15214)
+ * When a table attempts to clean up metrics, it was cleaning up all global
table metrics (CASSANDRA-16095)
+ * Bring back the accepted encryption protocols list as configurable option
(CASSANDRA-13325)
+ * DigestResolver.getData throws AssertionError since dataResponse is null
(CASSANDRA-16097)
+ * Cannot replace_address /X because it doesn't exist in gossip
(CASSANDRA-16213)
+ * cqlsh row_id resets on page boundaries (CASSANDRA-16160)
+Merged from 3.11:
+ * SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to
default of 1GB (CASSANDRA-16071)
+Merged from 3.0:
* Extend the exclusion of replica filtering protection to other indices
instead of just SASI (CASSANDRA-16311)
* Synchronize transaction logs for JBOD (CASSANDRA-16225)
* Fix the counting of cells per partition (CASSANDRA-16259)
diff --cc pylib/cqlshlib/copyutil.py
index ce4d35d,e60cd6e..8958164
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@@ -51,7 -45,7 +51,7 @@@ from six.moves.queue import Queu
from cassandra import OperationTimedOut
from cassandra.cluster import Cluster, DefaultConnection
- from cassandra.cqltypes import ReversedType, UserType, BytesType
-from cassandra.cqltypes import ReversedType, UserType, VarcharType
++from cassandra.cqltypes import ReversedType, UserType, BytesType, VarcharType
from cassandra.metadata import protect_name, protect_names, protect_value
from cassandra.policies import RetryPolicy, WhiteListRoundRobinPolicy,
DCAwareRoundRobinPolicy, FallthroughRetryPolicy
from cassandra.query import BatchStatement, BatchType, SimpleStatement,
tuple_factory
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
