cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [08/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 23 Jun 2016 07:58:32 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

* cassandra-2.2:
  Avoid clock skew corrupting other nodes through paxos


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

Branch: refs/heads/cassandra-3.0
Commit: 969f7974fe7f131ff09c36990e5dbc6e005a724c
Parents: 621d08a b3dd05e
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Jun 23 09:57:16 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Jun 23 09:57:16 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../apache/cassandra/service/ClientState.java   | 56 +++++++++++++++++---
 .../apache/cassandra/service/StorageProxy.java  |  6 ++-
 .../org/apache/cassandra/utils/UUIDGen.java     | 32 +++++++++++
 4 files changed, 88 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/969f7974/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 134a5e1,5106fad..26f24b0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,35 -1,9 +1,37 @@@
 -2.2.7
 +3.0.8
 + * Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023)
 + * Add TimeWindowCompactionStrategy (CASSANDRA-9666)
 +Merged from 2.2:
   * Validate bloom_filter_fp_chance against lowest supported
     value when the table is created (CASSANDRA-11920)
 - * RandomAccessReader: call isEOF() only when rebuffering, not for every read operation
(CASSANDRA-12013)
   * Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
   * StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
 +Merged from 2.1:
++ * Fix clock skew corrupting other nodes with paxos (CASSANDRA-11991)
++ * Remove distinction between non-existing static columns and existing but null in LWTs
(CASSANDRA-9842)
 + * Cache local ranges when calculating repair neighbors (CASSANDRA-11934)
 + * Allow LWT operation on static column with only partition keys (CASSANDRA-10532)
 + * Create interval tree over canonical sstables to avoid missing sstables during streaming
(CASSANDRA-11886)
 + * cqlsh COPY FROM: shutdown parent cluster after forking, to avoid corrupting SSL connections
(CASSANDRA-11749)
 +
 +
 +3.0.7
 + * Fix legacy serialization of Thrift-generated non-compound range tombstones
 +   when communicating with 2.x nodes (CASSANDRA-11930)
 + * Fix Directories instantiations where CFS.initialDirectories should be used (CASSANDRA-11849)
 + * Avoid referencing DatabaseDescriptor in AbstractType (CASSANDRA-11912)
 + * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
 + * cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
 + * Remove unneeded code to repair index summaries that have
 +   been improperly down-sampled (CASSANDRA-11127)
 + * Avoid WriteTimeoutExceptions during commit log replay due to materialized
 +   view lock contention (CASSANDRA-11891)
 + * Prevent OOM failures on SSTable corruption, improve tests for corruption detection (CASSANDRA-9530)
 + * Use CFS.initialDirectories when clearing snapshots (CASSANDRA-11705)
 + * Allow compaction strategies to disable early open (CASSANDRA-11754)
 + * Refactor Materialized View code (CASSANDRA-11475)
 + * Update Java Driver (CASSANDRA-11615)
 +Merged from 2.2:
   * Persist local metadata earlier in startup sequence (CASSANDRA-11742)
   * Run CommitLog tests with different compression settings (CASSANDRA-9039)
   * cqlsh: fix tab completion for case-sensitive identifiers (CASSANDRA-11664)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/969f7974/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/969f7974/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/969f7974/src/java/org/apache/cassandra/utils/UUIDGen.java
----------------------------------------------------------------------


Mime
View raw message