cassandra-commits mailing list archives

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


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

Branch: refs/heads/cassandra-3.X
Commit: d4a914d2166f8fa2345127bb3d86503b2921be33
Parents: 575927b 5883e43
Author: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Authored: Fri Oct 21 19:04:04 2016 -0700
Committer: Jeff Jirsa <jeff.jirsa@crowdstrike.com>
Committed: Fri Oct 21 19:04:40 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/d4a914d2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 105791b,46f27a6..b965262
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -136,11 -33,10 +136,12 @@@ Merged from 2.2
   * 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)
 + * cqlshlib tests: increase default execute timeout (CASSANDRA-12481)
 + * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523)
 + * Fail repair on non-existing table (CASSANDRA-12279)
 + * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522)
+  * Split consistent range movement flag correction (CASSANDRA-12786)
  Merged from 2.1:
 - * 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/d4a914d2/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message