cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7
Date Thu, 26 May 2016 06:34:05 GMT
Merge branch 'cassandra-3.0' into cassandra-3.7


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

Branch: refs/heads/trunk
Commit: e0800e7eb071b42de9a97768158d9cf1c3701a23
Parents: 68d20ed 716f02e
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Thu May 26 08:23:14 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Thu May 26 08:23:14 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../repair/RepairMessageVerbHandler.java        | 11 +--
 .../apache/cassandra/repair/RepairRunnable.java |  2 +-
 .../cassandra/service/ActiveRepairService.java  | 93 ++++++++++++++++++--
 .../LeveledCompactionStrategyTest.java          |  2 +-
 .../cassandra/repair/LocalSyncTaskTest.java     |  3 +-
 .../service/ActiveRepairServiceTest.java        |  2 +-
 7 files changed, 97 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0800e7e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b2d31bb,062bb7b..3acd3da
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -10,10 -8,9 +10,11 @@@ Merged from 2.2
   * Enable client encryption in sstableloader with cli options (CASSANDRA-11708)
   * Possible memory leak in NIODataInputStream (CASSANDRA-11867)
   * Add seconds to cqlsh tracing session duration (CASSANDRA-11753)
 + * Fix commit log replay after out-of-order flush completion (CASSANDRA-9669)
   * Prohibit Reversed Counter type as part of the PK (CASSANDRA-9395)
 + * cqlsh: correctly handle non-ascii chars in error messages (CASSANDRA-11626)
  Merged from 2.1:
+  * Clear out parent repair session if repair coordinator dies (CASSANDRA-11824)
   * Set default streaming_socket_timeout_in_ms to 24 hours (CASSANDRA-11840)
   * Do not consider local node a valid source during replace (CASSANDRA-11848)
   * Add message dropped tasks to nodetool netstats (CASSANDRA-11855)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0800e7e/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0800e7e/src/java/org/apache/cassandra/repair/RepairRunnable.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e0800e7e/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
----------------------------------------------------------------------


Mime
View raw message