This is an automated email from the ASF dual-hosted git repository.

mshuler pushed a commit to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 24a708dbcd53762ffd2f5eac00aa1316495843e9
Merge: b8a942d 900292b
Author: Michael Shuler <mshu...@apache.org>
AuthorDate: Mon Jan 14 11:37:56 2019 -0600

    Merge branch 'cassandra-2.2' into cassandra-3.0

 CHANGES.txt | 2 ++
 build.xml   | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --cc CHANGES.txt
index 64e989b,4c273ea..025d4b0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,72 -1,17 +1,74 @@@
 -2.2.14
 +3.0.18
 + * 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:
   * 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:
+  * Update release checksum algorithms to SHA-256, SHA-512 (CASSANDRA-14970)
  
  
 -2.2.13
 +3.0.17
 + * Fix corrupted static collection deletions in 3.0 -> 2.{1,2} messages 
(CASSANDRA-14568)
 + * Fix potential IndexOutOfBoundsException with counters (CASSANDRA-14167)
 + * Restore resumable hints delivery, backport CASSANDRA-11960 
(CASSANDRA-14419)
 + * Always close RT markers returned by ReadCommand#executeLocally() 
(CASSANDRA-14515)
 + * Reverse order queries with range tombstones can cause data loss 
(CASSANDRA-14513)
 + * Fix regression of lagging commitlog flush log message (CASSANDRA-14451)
 + * Add Missing dependencies in pom-all (CASSANDRA-14422)
 + * Cleanup StartupClusterConnectivityChecker and PING Verb (CASSANDRA-14447)
 + * Fix deprecated repair error notifications from 3.x clusters to legacy JMX 
clients (CASSANDRA-13121)
 + * Cassandra not starting when using enhanced startup scripts in windows 
(CASSANDRA-14418)
 + * Fix progress stats and units in compactionstats (CASSANDRA-12244)
 + * Better handle missing partition columns in system_schema.columns 
(CASSANDRA-14379)
 + * Delay hints store excise by write timeout to avoid race with decommission 
(CASSANDRA-13740)
 + * Deprecate background repair and probablistic read_repair_chance table 
options
 +   (CASSANDRA-13910)
 + * Add missed CQL keywords to documentation (CASSANDRA-14359)
 + * Fix unbounded validation compactions on repair / revert CASSANDRA-13797 
(CASSANDRA-14332)
 + * Avoid deadlock when running nodetool refresh before node is fully up 
(CASSANDRA-14310)
 + * Handle all exceptions when opening sstables (CASSANDRA-14202)
 + * Handle incompletely written hint descriptors during startup 
(CASSANDRA-14080)
 + * Handle repeat open bound from SRP in read repair (CASSANDRA-14330)
 + * Respect max hint window when hinting for LWT (CASSANDRA-14215)
 + * Adding missing WriteType enum values to v3, v4, and v5 spec 
(CASSANDRA-13697)
 + * Don't regenerate bloomfilter and summaries on startup (CASSANDRA-11163)
 + * Fix NPE when performing comparison against a null frozen in LWT 
(CASSANDRA-14087)
 + * Log when SSTables are deleted (CASSANDRA-14302)
 + * Fix batch commitlog sync regression (CASSANDRA-14292)
 + * Write to pending endpoint when view replica is also base replica 
(CASSANDRA-14251)
 + * Chain commit log marker potential performance regression in batch commit 
mode (CASSANDRA-14194)
 + * Fully utilise specified compaction threads (CASSANDRA-14210)
 + * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
 +Merged from 2.2:
   * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
   * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to