Merge branch 'cassandra-2.1' into cassandra-2.2

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

Branch: refs/heads/cassandra-2.2
Commit: bdd88a2f6a1cd12f23bc084e64ec24ca60f20e04
Parents: 073f062 851aed7
Author: Marcus Eriksson <marc...@apache.org>
Authored: Fri Nov 20 12:04:04 2015 +0100
Committer: Marcus Eriksson <marc...@apache.org>
Committed: Fri Nov 20 12:04:04 2015 +0100

----------------------------------------------------------------------
 NEWS.txt | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bdd88a2f/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index b67814a,54a6b79..4cf9c7b
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -33,11 -18,22 +33,15 @@@ Operation
  
  New features
  ------------
+     - Time windows in DTCS are now limited to 1 day by default to be able to
+       handle bootstrap and repair in a better way. To get the old behaviour,
+       increase max_window_size_seconds.
+     - DTCS option max_sstable_age_days is now deprecated and defaults to 1000 
days.
      - Native protocol server now allows both SSL and non-SSL connections on
        the same port.
 -    - Switching racks is no longer an allowed operation on a node which has
 -      data. Instead, the node will need to be decommissioned and 
rebootstrapped.
 -      If moving from the SimpleSnitch, make sure the rack containing all 
current
 -      nodes is named "rack1". To override this behavior when manually wiping
 -      the node and bootstrapping, use -Dcassandra.ignore_rack=true.
 -    - a new validate(key, cf) method is added to PerRowSecondaryIndex. A 
default
 -      implementation is provided, so no changes are required to custom 
implementations.
  
  
 -2.1.11
 +2.2.3
  =====
  
  Upgrading

Reply via email to