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 2018/12/13 18:23:59 UTC

[05/10] cassandra git commit: Merge branch '14928-2.2' into 14928-3.0

Merge branch '14928-2.2' into 14928-3.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1816520d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1816520d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1816520d

Branch: refs/heads/cassandra-3.11
Commit: 1816520d6c59cece5ef8346c95e4f12e7c285751
Parents: 4f3a6fe 505a03c
Author: Ariel Weisberg <aw...@apple.com>
Authored: Thu Dec 13 12:30:36 2018 -0500
Committer: Ariel Weisberg <aw...@apple.com>
Committed: Thu Dec 13 12:30:36 2018 -0500

----------------------------------------------------------------------
 CHANGES.txt                                           |  1 +
 .../apache/cassandra/service/MigrationManager.java    | 11 +++++++++--
 src/java/org/apache/cassandra/utils/FBUtilities.java  | 14 +++++++++++++-
 3 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1816520d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 01d4789,58309fa..8fd0200
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,33 -1,9 +1,34 @@@
 -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:
+  * 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)
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1816520d/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1816520d/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------


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