This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit f61b926b940f272ced0f2f6b2db2a9f3fd8d3599
Merge: db3c852 1d06b66
Author: Ariel Weisberg <aweisb...@apple.com>
AuthorDate: Fri Jan 18 12:39:50 2019 -0500
Merge branch 'cassandra-2.2' into cassandra-3.0
.circleci/config.yml | 2 +-
CHANGES.txt | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index eeb3068,99da8f6..812af0a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,38 -1,11 +1,39 @@@
-2.2.14
+3.0.18
+ * 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)
+ * CommitLogReplayer.handleReplayError should print stack traces
(CASSANDRA-14589)
+ * 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)
+ * Fix handling of collection tombstones for dropped columns from legacy
sstables (CASSANDRA-14912)
+ * Throw exception if Columns serialized subset encode more columns than
possible (CASSANDRA-14591)
+ * Drop/add column name with different Kind can result in corruption
(CASSANDRA-14843)
+ * Fix missing rows when reading 2.1 SSTables with static columns in 3.0
(CASSANDRA-14873)
+ * Move TWCS message 'No compaction necessary for bucket size' to Trace level
(CASSANDRA-14884)
+ * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
+ * Dropped columns can cause reverse sstable iteration to return prematurely
(CASSANDRA-14838)
+ * Legacy sstables with multi block range tombstones create invalid bound
sequences (CASSANDRA-14823)
+ * Expand range tombstone validation checks to multiple interim request
stages (CASSANDRA-14824)
+ * Reverse order reads can return incomplete results (CASSANDRA-14803)
+ * Avoid calling iter.next() in a loop when notifying indexers about range
tombstones (CASSANDRA-14794)
+ * Fix purging semi-expired RT boundaries in reversed iterators
(CASSANDRA-14672)
+ * DESC order reads can fail to return the last Unfiltered in the partition
(CASSANDRA-14766)
+ * Fix corrupted collection deletions for dropped columns in 3.0 <-> 2.{1,2}
messages (CASSANDRA-14568)
+ * Fix corrupted static collection deletions in 3.0 <-> 2.{1,2} messages
(CASSANDRA-14568)
+ * Handle failures in parallelAllSSTableOperation
(cleanup/upgradesstables/etc) (CASSANDRA-14657)
+ * Improve TokenMetaData cache populating performance avoid long locking
(CASSANDRA-14660)
+ * Backport: Flush netty client messages immediately (not by default)
(CASSANDRA-13651)
+ * Fix static column order for SELECT * wildcard queries (CASSANDRA-14638)
+ * sstableloader should use discovered broadcast address to connect
intra-cluster (CASSANDRA-14522)
+ * Fix reading columns with non-UTF names from schema (CASSANDRA-14468)
+ Merged from 2.2:
+ * CircleCI docker image should bake in more dependencies (CASSANDRA-14985)
* Don't enable client transports when bootstrap is pending (CASSANDRA-14525)
* MigrationManager attempts to pull schema from different major version
nodes (CASSANDRA-14928)
- * Don't skip entire sstables when reading backwards with mixed clustering
column order
- (CASSANDRA-14910)
- * Cannot perform slice reads in reverse direction against tables with
clustering columns
- in mixed order (CASSANDRA-14899)
* Fix incorrect cqlsh results when selecting same columns multiple times
(CASSANDRA-13262)
* Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
Merged from 2.1:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
