cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [5/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11
Date Mon, 14 Aug 2017 14:29:38 GMT
Merge branch 'cassandra-3.0' into cassandra-3.11


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

Branch: refs/heads/cassandra-3.11
Commit: db57cbddc390c7af4d824962686ab6f6a0b3d079
Parents: 1884dbe c2b635a
Author: Aleksey Yeschenko <aleksey@yeschenko.com>
Authored: Mon Aug 14 15:25:59 2017 +0100
Committer: Aleksey Yeschenko <aleksey@yeschenko.com>
Committed: Mon Aug 14 15:25:59 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/batchlog/BatchlogManager.java     | 19 ++++++++---
 .../batchlog/BatchlogEndpointFilterTest.java    | 33 ++++++++++++++++++--
 3 files changed, 47 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/db57cbdd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c672675,358dd04..5403812
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,9 -1,5 +1,10 @@@
 -3.0.15
 +3.11.1
 + * "ignore" option is ignored in sstableloader (CASSANDRA-13721)
 + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652)
 + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512)
 + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
 +Merged from 3.0:
+  * Randomize batchlog endpoint selection with only 1 or 2 racks (CASSANDRA-12884)
   * Fix digest calculation for counter cells (CASSANDRA-13750)
   * Fix ColumnDefinition.cellValueType() for non-frozen collection and change SSTabledump
to use type.toJSONString() (CASSANDRA-13573)
   * Skip materialized view addition if the base table doesn't exist (CASSANDRA-13737)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/db57cbdd/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message