cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jji...@apache.org
Subject [05/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Sat, 22 Oct 2016 02:09:01 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.X
Commit: 5883e43587a110fa21adc5e883aa62c5e3780924
Parents: 7976d65 2871377
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Fri Oct 21 19:02:58 2016 -0700
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Fri Oct 21 19:03:44 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f14eb22,8b61da4..46f27a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,12 -5,10 +30,13 @@@ Merged from 2.2
   * Fix merkle tree depth calculation (CASSANDRA-12580)
   * Make Collections deserialization more robust (CASSANDRA-12618)
   * Better handle invalid system roles table (CASSANDRA-12700)
 + * Fix exceptions when enabling gossip on nodes that haven't joined the ring (CASSANDRA-12253)
 + * Fix authentication problem when invoking cqlsh copy from a SOURCE command (CASSANDRA-12642)
 + * Decrement pending range calculator jobs counter in finally block
 +  (CASSANDRA-12554)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 -=======
 -2.1.17
 + * Add system property to set the max number of native transport requests in queue (CASSANDRA-11363)
   * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
  
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5883e435/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message